diff --git a/src/libopensc/pkcs15.c b/src/libopensc/pkcs15.c
index 09c0a349..373ec4c4 100644
--- a/src/libopensc/pkcs15.c
+++ b/src/libopensc/pkcs15.c
@@ -254,7 +254,7 @@ static const struct sc_asn1_entry c_asn1_ddo[] = {
 	{ "odfPath",	   SC_ASN1_PATH, SC_ASN1_CONS | SC_ASN1_TAG_SEQUENCE, SC_ASN1_OPTIONAL, NULL, NULL },
 	{ "tokenInfoPath", SC_ASN1_PATH, SC_ASN1_CONS | SC_ASN1_CTX | 0, SC_ASN1_OPTIONAL, NULL, NULL },
 	{ "unusedPath",    SC_ASN1_PATH, SC_ASN1_CONS | SC_ASN1_CTX | 1, SC_ASN1_OPTIONAL, NULL, NULL },
-/* According to PKCS#15 v1.1 here is the place for the future extentions.
+/* According to PKCS#15 v1.1 here is the place for the future extensions.
  * The following data are used when ODF record points to the xDF files in a different application. 
  */
 	{ "ddoIIN",	   SC_ASN1_OCTET_STRING, SC_ASN1_APP | 0x02, SC_ASN1_OPTIONAL, NULL, NULL },
diff --git a/src/pkcs15init/iasecc.profile b/src/pkcs15init/iasecc.profile
index ee4077f9..c6059c40 100644
--- a/src/pkcs15init/iasecc.profile
+++ b/src/pkcs15init/iasecc.profile
@@ -76,37 +76,37 @@ filesystem {
         DF CIA-Adele-AppDF {
             type    = DF;
             exclusive-aid	= E8:28:BD:08:0F:D2:50:00:00:04:01:01;
-            profile-extention	= "ias_adele_admin1";
+            profile-extension	= "ias_adele_admin1";
         }
 
         DF AdeleAdmin2-AppDF {
             type    = DF;
             exclusive-aid	= E8:28:BD:08:0F:D2:50:00:00:04:02:01;
-            profile-extention	= "ias_adele_admin2";
+            profile-extension	= "ias_adele_admin2";
         }
 
         DF AdeleCommon-AppDF {
             type    = DF;
             exclusive-aid	= E8:28:BD:08:0F:D2:50:00:00:04:03:01;
-            profile-extention	= "ias_adele_common";
+            profile-extension	= "ias_adele_common";
         }
 
         DF ECCeID-AppDF {
             type    = DF;
             exclusive-aid	= E8:28:BD:08:0F:D2:50:45:43:43:2D:65:49:44;
-            profile-extention	= "iasecc_admin_eid";
+            profile-extension	= "iasecc_admin_eid";
         }
 
         DF ECCGeneric-AppDF {
             type    = DF;
             exclusive-aid	= E8:28:BD:08:0F:D2:50:47:65:6E:65:72:69:63;
-            profile-extention	= "iasecc_generic_pki";
+            profile-extension	= "iasecc_generic_pki";
         }
 
 	DF ECCGenericOberthur-AppDF  {
             type = DF;
             exclusive-aid	= E8:28:BD:08:0F:F2:50:4F:54:20:41:57:50;
-            profile-extention	= "iasecc_generic_oberthur";
+            profile-extension	= "iasecc_generic_oberthur";
         }
     }
 }
diff --git a/src/pkcs15init/pkcs15-oberthur-awp.c b/src/pkcs15init/pkcs15-oberthur-awp.c
index dc5f4355..c0d09dc1 100644
--- a/src/pkcs15init/pkcs15-oberthur-awp.c
+++ b/src/pkcs15init/pkcs15-oberthur-awp.c
@@ -1,5 +1,5 @@
 /*
- * Oberthur AWP extention for PKCS #15 initialization
+ * Oberthur AWP extension for PKCS #15 initialization
  *
  * Copyright (C) 2010  Viktor Tarasov <viktor.tarasov@opentrust.com>
  * Copyright (C) 2002  Juha Yrjola <juha.yrjola@iki.fi>
diff --git a/src/pkcs15init/profile.c b/src/pkcs15init/profile.c
index 813fa7fc..bf24c69f 100644
--- a/src/pkcs15init/profile.c
+++ b/src/pkcs15init/profile.c
@@ -409,10 +409,10 @@ sc_profile_finish(struct sc_profile *profile, const struct sc_app_info *app_info
 		sc_log(ctx, "Look for file by path '%s'", sc_print_path(&path));
 		profile->df_info = sc_profile_find_file_by_path(profile, &path);
 		sc_log(ctx, "returned DF info %p", profile->df_info); 
-		if (profile->df_info && profile->df_info->profile_extention)   {
-			sc_log(ctx, "application profile extention '%s'", profile->df_info->profile_extention);
-			if (sc_profile_load(profile, profile->df_info->profile_extention))
-				LOG_TEST_RET(ctx, SC_ERROR_INCONSISTENT_PROFILE, "Cannot load application profile extention");
+		if (profile->df_info && profile->df_info->profile_extension)   {
+			sc_log(ctx, "application profile extension '%s'", profile->df_info->profile_extension);
+			if (sc_profile_load(profile, profile->df_info->profile_extension))
+				LOG_TEST_RET(ctx, SC_ERROR_INCONSISTENT_PROFILE, "Cannot load application profile extension");
 		}
 	}
 	
@@ -1396,9 +1396,9 @@ do_exclusive_aid(struct state *cur, int argc, char **argv)
 }
 
 static int
-do_profile_extention(struct state *cur, int argc, char **argv)
+do_profile_extension(struct state *cur, int argc, char **argv)
 {
-	return setstr(&cur->file->profile_extention, argv[0]);
+	return setstr(&cur->file->profile_extension, argv[0]);
 }
 
 /*
@@ -1724,7 +1724,7 @@ static struct command	fs_commands[] = {
  { "AID",		1,	1,	do_aid		},
  { "ACL",		1,	-1,	do_acl		},
 /* AID dependent sub-profile */
- { "profile-extention",	1,	1,	do_profile_extention	},
+ { "profile-extension",	1,	1,	do_profile_extension	},
 /* AID of the DFs without file-id */
  { "exclusive-aid",	1,	1,	do_exclusive_aid	},
 
diff --git a/src/pkcs15init/profile.h b/src/pkcs15init/profile.h
index c874d7cc..123f5079 100644
--- a/src/pkcs15init/profile.h
+++ b/src/pkcs15init/profile.h
@@ -39,10 +39,10 @@ struct file_info {
 	unsigned int		inst_index;
 	sc_path_t		inst_path;
 
-        /* Profile extention dependent on the application ID (sub-profile).
+        /* Profile extension dependent on the application ID (sub-profile).
 	 * Sub-profile is loaded when binding to the particular application
 	 * of the multi-application PKCS#15 card. */
-	char *			profile_extention;
+	char *			profile_extension;
 };
 
 /* For now, we assume the PUK always resides