4 files changed, 68 insertions, 68 deletions
diff --git a/src/Mount/Favorites.cpp b/src/Mount/Favorites.cpp
index 6fe871a0..1b6c59b3 100644
--- a/src/Mount/Favorites.cpp
+++ b/src/Mount/Favorites.cpp
@@ -770,22 +770,22 @@ namespace VeraCrypt
 		return true;
 	}
 
 
 	static void SetControls (HWND hwndDlg, const FavoriteVolume &favorite, bool systemFavoritesMode, bool enable)
 	{
 		if (favorite.Pin > 0)
 		{
-			char szTmp[MAX_PIN + 1];
+			char szTmp[MAX_PIM + 1];
 			StringCbPrintfA (szTmp, sizeof(szTmp), "%d", favorite.Pin);
-			SetDlgItemText (hwndDlg, IDC_PIN, szTmp);
+			SetDlgItemText (hwndDlg, IDC_PIM, szTmp);
 		}
 		else
-			SetDlgItemText (hwndDlg, IDC_PIN, "");
+			SetDlgItemText (hwndDlg, IDC_PIM, "");
 		SetDlgItemTextW (hwndDlg, IDC_FAVORITE_LABEL, favorite.Label.c_str());
 		SetCheckBox (hwndDlg, IDC_FAVORITE_MOUNT_ON_LOGON, favorite.MountOnLogOn);
 		SetCheckBox (hwndDlg, IDC_FAVORITE_MOUNT_ON_ARRIVAL, favorite.MountOnArrival);
 		SetCheckBox (hwndDlg, IDC_FAVORITE_MOUNT_READONLY, favorite.ReadOnly);
 		SetCheckBox (hwndDlg, IDC_FAVORITE_MOUNT_REMOVABLE, favorite.Removable);
 
 		if (systemFavoritesMode)
 		{
@@ -801,19 +801,19 @@ namespace VeraCrypt
 		{
 			SetCheckBox (hwndDlg, IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT, favorite.OpenExplorerWindow);
 			SetCheckBox (hwndDlg, IDC_FAVORITE_DISABLE_HOTKEY, favorite.DisableHotkeyMount);
 		}
 
 		EnableWindow (GetDlgItem (hwndDlg, IDC_FAVORITE_MOVE_UP), enable);
 		EnableWindow (GetDlgItem (hwndDlg, IDC_FAVORITE_MOVE_DOWN), enable);
 		EnableWindow (GetDlgItem (hwndDlg, IDC_FAVORITE_REMOVE), enable);
-		EnableWindow (GetDlgItem (hwndDlg, IDT_PIN), enable);
-		EnableWindow (GetDlgItem (hwndDlg, IDC_PIN), enable);
-		EnableWindow (GetDlgItem (hwndDlg, IDC_PIN_HELP), enable);
+		EnableWindow (GetDlgItem (hwndDlg, IDT_PIM), enable);
+		EnableWindow (GetDlgItem (hwndDlg, IDC_PIM), enable);
+		EnableWindow (GetDlgItem (hwndDlg, IDC_PIM_HELP), enable);
 		EnableWindow (GetDlgItem (hwndDlg, IDT_FAVORITE_LABEL), enable);
 		EnableWindow (GetDlgItem (hwndDlg, IDC_FAVORITE_LABEL), enable);
 		EnableWindow (GetDlgItem (hwndDlg, IDC_FAVORITE_MOUNT_ON_LOGON), enable && !systemFavoritesMode);
 		EnableWindow (GetDlgItem (hwndDlg, IDC_FAVORITE_MOUNT_ON_ARRIVAL), enable && !systemFavoritesMode);
 		EnableWindow (GetDlgItem (hwndDlg, IDC_FAVORITE_MOUNT_READONLY), enable);
 		EnableWindow (GetDlgItem (hwndDlg, IDC_FAVORITE_MOUNT_REMOVABLE), enable);
 		EnableWindow (GetDlgItem (hwndDlg, IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT), enable || systemFavoritesMode);
 		EnableWindow (GetDlgItem (hwndDlg, IDC_FAVORITE_DISABLE_HOTKEY), enable || systemFavoritesMode);
@@ -831,17 +831,17 @@ namespace VeraCrypt
 			{
 				if (favorite.Label[i] == L'"')
 					favorite.Label.at (i) = L'\'';
 			}
 		}
 		else
 			favorite.Label.clear();
 
-		favorite.Pin = GetPin (hwndDlg, IDC_PIN);
+		favorite.Pin = GetPin (hwndDlg, IDC_PIM);
 
 		favorite.ReadOnly = (IsDlgButtonChecked (hwndDlg, IDC_FAVORITE_MOUNT_READONLY) != 0);
 		favorite.Removable = (IsDlgButtonChecked (hwndDlg, IDC_FAVORITE_MOUNT_REMOVABLE) != 0);
 
 		if (!systemFavoritesMode)
 		{
 			favorite.MountOnLogOn = (IsDlgButtonChecked (hwndDlg, IDC_FAVORITE_MOUNT_ON_LOGON) != 0);
 			favorite.MountOnArrival = (IsDlgButtonChecked (hwndDlg, IDC_FAVORITE_MOUNT_ON_ARRIVAL) != 0);
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c
index b14061bc..83767be1 100644
--- a/src/Mount/Mount.c
+++ b/src/Mount/Mount.c
@@ -1805,18 +1805,18 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 			ZeroMemory (&newKeyFilesParam, sizeof (newKeyFilesParam));
 
 			SetWindowTextW (hwndDlg, GetString ("IDD_PASSWORDCHANGE_DLG"));
 			LocalizeDialog (hwndDlg, "IDD_PASSWORDCHANGE_DLG");
 
 			SendMessage (GetDlgItem (hwndDlg, IDC_OLD_PASSWORD), EM_LIMITTEXT, MAX_PASSWORD, 0);
 			SendMessage (GetDlgItem (hwndDlg, IDC_PASSWORD), EM_LIMITTEXT, MAX_PASSWORD, 0);
 			SendMessage (GetDlgItem (hwndDlg, IDC_VERIFY), EM_LIMITTEXT, MAX_PASSWORD, 0);
-			SendMessage (GetDlgItem (hwndDlg, IDC_OLD_PIN), EM_LIMITTEXT, MAX_PIN, 0);
-			SendMessage (GetDlgItem (hwndDlg, IDC_PIN), EM_LIMITTEXT, MAX_PIN, 0);
+			SendMessage (GetDlgItem (hwndDlg, IDC_OLD_PIM), EM_LIMITTEXT, MAX_PIM, 0);
+			SendMessage (GetDlgItem (hwndDlg, IDC_PIM), EM_LIMITTEXT, MAX_PIM, 0);
 			EnableWindow (GetDlgItem (hwndDlg, IDOK), FALSE);
 
 			SetCheckBox (hwndDlg, IDC_ENABLE_KEYFILES, KeyFilesEnable);
 			EnableWindow (GetDlgItem (hwndDlg, IDC_KEYFILES), TRUE);
 			EnableWindow (GetDlgItem (hwndDlg, IDC_NEW_KEYFILES), TRUE);
 
 			/* Add PRF algorithm list for current password */
 			SendMessage (hComboBox, CB_RESETCONTENT, 0, 0);
@@ -1855,35 +1855,35 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 
 			switch (pwdChangeDlgMode)
 			{
 			case PCDM_CHANGE_PKCS5_PRF:
 				SetWindowTextW (hwndDlg, GetString ("IDD_PCDM_CHANGE_PKCS5_PRF"));
 				LocalizeDialog (hwndDlg, "IDD_PCDM_CHANGE_PKCS5_PRF");
 				EnableWindow (GetDlgItem (hwndDlg, IDC_PASSWORD), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDC_VERIFY), FALSE);
-				EnableWindow (GetDlgItem (hwndDlg, IDT_PIN), FALSE);
-				EnableWindow (GetDlgItem (hwndDlg, IDC_PIN), FALSE);
-				EnableWindow (GetDlgItem (hwndDlg, IDC_PIN_HELP), FALSE);
+				EnableWindow (GetDlgItem (hwndDlg, IDT_PIM), FALSE);
+				EnableWindow (GetDlgItem (hwndDlg, IDC_PIM), FALSE);
+				EnableWindow (GetDlgItem (hwndDlg, IDC_PIM_HELP), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDC_ENABLE_NEW_KEYFILES), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDC_SHOW_PASSWORD_CHPWD_NEW), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDC_NEW_KEYFILES), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDT_NEW_PASSWORD), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDT_CONFIRM_PASSWORD), FALSE);
 				break;
 
 			case PCDM_ADD_REMOVE_VOL_KEYFILES:
 				SetWindowTextW (hwndDlg, GetString ("IDD_PCDM_ADD_REMOVE_VOL_KEYFILES"));
 				LocalizeDialog (hwndDlg, "IDD_PCDM_ADD_REMOVE_VOL_KEYFILES");
 				newKeyFilesParam.EnableKeyFiles = TRUE;
 				EnableWindow (GetDlgItem (hwndDlg, IDC_PASSWORD), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDC_VERIFY), FALSE);
-				EnableWindow (GetDlgItem (hwndDlg, IDT_PIN), FALSE);
-				EnableWindow (GetDlgItem (hwndDlg, IDC_PIN), FALSE);
-				EnableWindow (GetDlgItem (hwndDlg, IDC_PIN_HELP), FALSE);
+				EnableWindow (GetDlgItem (hwndDlg, IDT_PIM), FALSE);
+				EnableWindow (GetDlgItem (hwndDlg, IDC_PIM), FALSE);
+				EnableWindow (GetDlgItem (hwndDlg, IDC_PIM_HELP), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDC_SHOW_PASSWORD_CHPWD_NEW), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDT_NEW_PASSWORD), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDT_CONFIRM_PASSWORD), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDT_PKCS5_PRF), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), FALSE);
 				break;
 
 			case PCDM_REMOVE_ALL_KEYFILES_FROM_VOL:
@@ -1891,19 +1891,19 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 				SetWindowTextW (hwndDlg, GetString ("IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL"));
 				LocalizeDialog (hwndDlg, "IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL");
 				KeyFilesEnable = TRUE;
 				SetCheckBox (hwndDlg, IDC_ENABLE_KEYFILES, TRUE);
 				EnableWindow (GetDlgItem (hwndDlg, IDC_KEYFILES), TRUE);
 				EnableWindow (GetDlgItem (hwndDlg, IDC_ENABLE_KEYFILES), TRUE);
 				EnableWindow (GetDlgItem (hwndDlg, IDC_PASSWORD), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDC_VERIFY), FALSE);
-				EnableWindow (GetDlgItem (hwndDlg, IDT_PIN), FALSE);
-				EnableWindow (GetDlgItem (hwndDlg, IDC_PIN), FALSE);
-				EnableWindow (GetDlgItem (hwndDlg, IDC_PIN_HELP), FALSE);
+				EnableWindow (GetDlgItem (hwndDlg, IDT_PIM), FALSE);
+				EnableWindow (GetDlgItem (hwndDlg, IDC_PIM), FALSE);
+				EnableWindow (GetDlgItem (hwndDlg, IDC_PIM_HELP), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDC_ENABLE_NEW_KEYFILES), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDC_SHOW_PASSWORD_CHPWD_NEW), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDC_NEW_KEYFILES), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDT_NEW_PASSWORD), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDT_CONFIRM_PASSWORD), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDT_PKCS5_PRF), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), FALSE);
 				break;
@@ -2027,17 +2027,17 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 				}
 			}
 			return 1;
 		}
 		return 0;
 
 	case WM_CTLCOLORSTATIC:
 		{
-			if (PinValueChangedWarning && ((HWND)lParam == GetDlgItem(hwndDlg, IDC_PIN_HELP)) )
+			if (PinValueChangedWarning && ((HWND)lParam == GetDlgItem(hwndDlg, IDC_PIM_HELP)) )
 			{
 				// we're about to draw the static
 				// set the text colour in (HDC)lParam
 				SetBkMode((HDC)wParam,TRANSPARENT);
 				SetTextColor((HDC)wParam, RGB(255,0,0));
 				// NOTE: per documentation as pointed out by selbie, GetSolidBrush would leak a GDI handle.
 				return (BOOL)GetSysColorBrush(COLOR_MENU);
 			}
@@ -2063,34 +2063,34 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		if (hw == EN_CHANGE)
 		{
 			PasswordChangeEnable (hwndDlg, IDOK,
 				IDC_OLD_PASSWORD,
 				KeyFilesEnable && FirstKeyFile != NULL,
 				IDC_PASSWORD, IDC_VERIFY, 
 				newKeyFilesParam.EnableKeyFiles && newKeyFilesParam.FirstKeyFile != NULL);	
 
-			if ((lw == IDC_OLD_PIN) && IsWindowEnabled (GetDlgItem (hwndDlg, IDC_PIN)))
+			if ((lw == IDC_OLD_PIM) && IsWindowEnabled (GetDlgItem (hwndDlg, IDC_PIM)))
 			{
-				char tmp[MAX_PIN+1] = {0};
-				GetDlgItemText (hwndDlg, IDC_OLD_PIN, tmp, MAX_PIN + 1);
-				SetDlgItemText (hwndDlg, IDC_PIN, tmp);
+				char tmp[MAX_PIM+1] = {0};
+				GetDlgItemText (hwndDlg, IDC_OLD_PIM, tmp, MAX_PIM + 1);
+				SetDlgItemText (hwndDlg, IDC_PIM, tmp);
 			}
 
-			if (lw == IDC_PIN)
+			if (lw == IDC_PIM)
 			{
-				if(GetPin (hwndDlg, IDC_OLD_PIN) != GetPin (hwndDlg, IDC_PIN))
+				if(GetPin (hwndDlg, IDC_OLD_PIM) != GetPin (hwndDlg, IDC_PIM))
 				{
 					PinValueChangedWarning = TRUE;
-					SetDlgItemTextW (hwndDlg, IDC_PIN_HELP, GetString (bSysEncPwdChangeDlgMode? "PIN_SYSENC_CHANGE_WARNING" : "PIN_CHANGE_WARNING"));
+					SetDlgItemTextW (hwndDlg, IDC_PIM_HELP, GetString (bSysEncPwdChangeDlgMode? "PIM_SYSENC_CHANGE_WARNING" : "PIM_CHANGE_WARNING"));
 				}
 				else
 				{
 					PinValueChangedWarning = FALSE;
-					SetDlgItemTextW (hwndDlg, IDC_PIN_HELP, (wchar_t *) GetDictionaryValueByInt (IDC_PIN_HELP));
+					SetDlgItemTextW (hwndDlg, IDC_PIM_HELP, (wchar_t *) GetDictionaryValueByInt (IDC_PIM_HELP));
 				}
 			}
 
 			return 1;
 		}
 
 		if (lw == IDC_KEYFILES)
 		{
@@ -2199,19 +2199,19 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 			}
 			return 1;
 
 		}
 
 		if (lw == IDC_TRUECRYPT_MODE)
 		{
 			BOOL bEnablePin = GetCheckBox (hwndDlg, IDC_TRUECRYPT_MODE) ? FALSE: TRUE;
-			EnableWindow (GetDlgItem (hwndDlg, IDT_OLD_PIN), bEnablePin);
-			EnableWindow (GetDlgItem (hwndDlg, IDC_OLD_PIN), bEnablePin);
-			EnableWindow (GetDlgItem (hwndDlg, IDC_OLD_PIN_HELP), bEnablePin);
+			EnableWindow (GetDlgItem (hwndDlg, IDT_OLD_PIM), bEnablePin);
+			EnableWindow (GetDlgItem (hwndDlg, IDC_OLD_PIM), bEnablePin);
+			EnableWindow (GetDlgItem (hwndDlg, IDC_OLD_PIM_HELP), bEnablePin);
 		}
 
 		if (lw == IDC_SHOW_PASSWORD_CHPWD_ORI)
 		{
 			SendMessage (GetDlgItem (hwndDlg, IDC_OLD_PASSWORD),
 						EM_SETPASSWORDCHAR,
 						GetCheckBox (hwndDlg, IDC_SHOW_PASSWORD_CHPWD_ORI) ? 0 : '*',
 						0);
@@ -2246,40 +2246,40 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 				0);
 			int nStatus;
 			int old_pkcs5 = (int) SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_OLD_PRF_ID), CB_GETITEMDATA, 
 					SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_OLD_PRF_ID), CB_GETCURSEL, 0, 0), 0);
 			int pkcs5 = (int) SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETITEMDATA, 
 					SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETCURSEL, 0, 0), 0);
 			BOOL truecryptMode = GetCheckBox (hwndDlg, IDC_TRUECRYPT_MODE);
 
-			int old_pin = GetPin (hwndDlg, IDC_OLD_PIN);
-			int pin = GetPin (hwndDlg, IDC_PIN);
+			int old_pin = GetPin (hwndDlg, IDC_OLD_PIM);
+			int pin = GetPin (hwndDlg, IDC_PIM);
 
 			if (truecryptMode && (old_pkcs5 == SHA256))
 			{
 				Error ("ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE", hwndDlg);
 				return 1;
 			}
 			else if (truecryptMode && (old_pin != 0))
 			{
-				Error ("PIN_NOT_SUPPORTED_FOR_TRUECRYPT_MODE", hwndDlg);
+				Error ("PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE", hwndDlg);
 				return 1;
 			}
 
 			if (!CheckPasswordCharEncoding (GetDlgItem (hwndDlg, IDC_PASSWORD), NULL))
 			{
 				Error ("UNSUPPORTED_CHARS_IN_PWD", hwndDlg);
 				return 1;
 			}
 
-			if (bSysEncPwdChangeDlgMode && (pin > MAX_BOOT_PIN_VALUE))
+			if (bSysEncPwdChangeDlgMode && (pin > MAX_BOOT_PIM_VALUE))
 			{
-				SetFocus (GetDlgItem(hwndDlg, IDC_PIN));
-				Error ("PIN_SYSENC_TOO_BIG", hwndDlg);
+				SetFocus (GetDlgItem(hwndDlg, IDC_PIM));
+				Error ("PIM_SYSENC_TOO_BIG", hwndDlg);
 				return 1;
 			}
 
 			if (pwdChangeDlgMode == PCDM_CHANGE_PKCS5_PRF)
 			{
 				newKeyFilesParam.EnableKeyFiles = KeyFilesEnable;
 			}
 			else if (!(newKeyFilesParam.EnableKeyFiles && newKeyFilesParam.FirstKeyFile != NULL)
@@ -2438,19 +2438,19 @@ BOOL CALLBACK PasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 					defaultPrfIndex = nIndex;
 			}
 
 			/* make autodetection the default unless a specific PRF was specified in the command line */
 			SendMessage (hComboBox, CB_SETCURSEL, defaultPrfIndex, 0);
 
 			SendMessage (GetDlgItem (hwndDlg, IDC_PASSWORD), EM_LIMITTEXT, MAX_PASSWORD, 0);
 			SendMessage (GetDlgItem (hwndDlg, IDC_CACHE), BM_SETCHECK, bCacheInDriver ? BST_CHECKED:BST_UNCHECKED, 0);
-			SendMessage (GetDlgItem (hwndDlg, IDC_PIN), EM_LIMITTEXT, MAX_PIN, 0);
+			SendMessage (GetDlgItem (hwndDlg, IDC_PIM), EM_LIMITTEXT, MAX_PIM, 0);
 
-			SetPin (hwndDlg, IDC_PIN, *pin);
+			SetPin (hwndDlg, IDC_PIM, *pin);
 
 			SetCheckBox (hwndDlg, IDC_KEYFILES_ENABLE, KeyFilesEnable);
 
 			mountOptions.PartitionInInactiveSysEncScope = bPrebootPasswordDlgMode;
 
 			if (bPrebootPasswordDlgMode)
 			{
 				SendMessage (hwndDlg, TC_APPMSG_PREBOOT_PASSWORD_MODE, 0, 0);
@@ -2542,17 +2542,17 @@ BOOL CALLBACK PasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 
 			SendMessage (GetDlgItem (hwndDlg, IDC_PASSWORD), EM_SETPASSWORDCHAR, '*', 0);
 			InvalidateRect (GetDlgItem (hwndDlg, IDC_PASSWORD), NULL, TRUE);
 
 			SetCheckBox (hwndDlg, IDC_KEYFILES_ENABLE, FALSE);
 			EnableWindow (GetDlgItem (hwndDlg, IDC_KEYFILES_ENABLE), FALSE);
 			EnableWindow (GetDlgItem (hwndDlg, IDC_KEYFILES), FALSE);
 
-			SetPin (hwndDlg, IDC_PIN, *pin);
+			SetPin (hwndDlg, IDC_PIM, *pin);
 
 			bPrebootPasswordDlgMode = TRUE;
 		}
 		return 1;
 
 	case WM_TIMER:
 		switch (wParam)
 		{
@@ -2620,19 +2620,19 @@ BOOL CALLBACK PasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 						0);
 			InvalidateRect (GetDlgItem (hwndDlg, IDC_PASSWORD), NULL, TRUE);
 			return 1;
 		}
 
 		if (lw == IDC_TRUECRYPT_MODE)
 		{
 			BOOL bEnablePin = GetCheckBox (hwndDlg, IDC_TRUECRYPT_MODE) ? FALSE: TRUE;
-			EnableWindow (GetDlgItem (hwndDlg, IDT_PIN), bEnablePin);
-			EnableWindow (GetDlgItem (hwndDlg, IDC_PIN), bEnablePin);
-			EnableWindow (GetDlgItem (hwndDlg, IDC_PIN_HELP), bEnablePin);
+			EnableWindow (GetDlgItem (hwndDlg, IDT_PIM), bEnablePin);
+			EnableWindow (GetDlgItem (hwndDlg, IDC_PIM), bEnablePin);
+			EnableWindow (GetDlgItem (hwndDlg, IDC_PIM_HELP), bEnablePin);
 		}
 
 		if (lw == IDC_KEY_FILES)
 		{
 			KeyFilesDlgParam param;
 			param.EnableKeyFiles = KeyFilesEnable;
 			param.FirstKeyFile = FirstKeyFile;
 
@@ -2667,32 +2667,32 @@ BOOL CALLBACK PasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 
 				GetWindowText (GetDlgItem (hwndDlg, IDC_PASSWORD), (LPSTR) szXPwd->Text, MAX_PASSWORD + 1);
 				szXPwd->Length = (unsigned __int32) strlen ((char *) szXPwd->Text);
 
 				bCacheInDriver = IsButtonChecked (GetDlgItem (hwndDlg, IDC_CACHE));	 
 				*pkcs5 = (int) SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETITEMDATA, SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETCURSEL, 0, 0), 0);
 				*truecryptMode = GetCheckBox (hwndDlg, IDC_TRUECRYPT_MODE);
 
-				*pin = GetPin (hwndDlg, IDC_PIN);
+				*pin = GetPin (hwndDlg, IDC_PIM);
 
 				/* SHA-256 is not supported by TrueCrypt */
 				if (	(*truecryptMode) 
 					&& ((*pkcs5 == SHA256) || (mountOptions.ProtectHiddenVolume && mountOptions.ProtectedHidVolPkcs5Prf == SHA256))
 					)
 				{
 					Error ("ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE", hwndDlg);
 					return 1;
 				}
 
 				if (	(*truecryptMode) 
 					&&	(*pin != 0)
 					)
 				{
-					Error ("PIN_NOT_SUPPORTED_FOR_TRUECRYPT_MODE", hwndDlg);
+					Error ("PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE", hwndDlg);
 					return 1;
 				}
 			}
 
 			// Attempt to wipe password stored in the input field buffer
 			memset (tmp, 'X', MAX_PASSWORD);
 			tmp[MAX_PASSWORD] = 0;
 			SetWindowText (GetDlgItem (hwndDlg, IDC_PASSWORD), tmp);	
@@ -3066,29 +3066,29 @@ BOOL CALLBACK MountOptionsDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 			EnableWindow (GetDlgItem (hwndDlg, IDT_HIDDEN_VOL_PROTECTION), !IsButtonChecked (GetDlgItem (hwndDlg, IDC_MOUNT_READONLY)));
 			EnableWindow (GetDlgItem (hwndDlg, IDC_PASSWORD_PROT_HIDVOL), protect);
 			EnableWindow (GetDlgItem (hwndDlg, IDC_SHOW_PASSWORD_MO), protect);
 			EnableWindow (GetDlgItem (hwndDlg, IDT_HIDDEN_PROT_PASSWD), protect);
 			EnableWindow (GetDlgItem (hwndDlg, IDC_KEYFILES_HIDVOL_PROT), protect);
 			EnableWindow (GetDlgItem (hwndDlg, IDC_KEYFILES_ENABLE_HIDVOL_PROT), protect);
 			EnableWindow (GetDlgItem (hwndDlg, IDT_PKCS5_PRF), protect);
 			EnableWindow (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), protect);
-			EnableWindow (GetDlgItem (hwndDlg, IDT_PIN), protect);
-			EnableWindow (GetDlgItem (hwndDlg, IDC_PIN), protect);
-			EnableWindow (GetDlgItem (hwndDlg, IDC_PIN_HELP), protect);
+			EnableWindow (GetDlgItem (hwndDlg, IDT_PIM), protect);
+			EnableWindow (GetDlgItem (hwndDlg, IDC_PIM), protect);
+			EnableWindow (GetDlgItem (hwndDlg, IDC_PIM_HELP), protect);
 
 			SetCheckBox (hwndDlg, IDC_KEYFILES_ENABLE_HIDVOL_PROT, hidVolProtKeyFilesParam.EnableKeyFiles);
 
 			SendDlgItemMessage (hwndDlg, IDC_PASSWORD_PROT_HIDVOL, EM_LIMITTEXT, MAX_PASSWORD, 0);
-			SendDlgItemMessage (hwndDlg, IDC_PIN, EM_LIMITTEXT, MAX_PIN, 0);
+			SendDlgItemMessage (hwndDlg, IDC_PIM, EM_LIMITTEXT, MAX_PIM, 0);
 
 			if (mountOptions->ProtectedHidVolPassword.Length > 0)
 				SetWindowText (GetDlgItem (hwndDlg, IDC_PASSWORD_PROT_HIDVOL), (LPSTR) mountOptions->ProtectedHidVolPassword.Text);	
 
-			SetPin (hwndDlg, IDC_PIN, mountOptions->ProtectedHidVolPin);
+			SetPin (hwndDlg, IDC_PIM, mountOptions->ProtectedHidVolPin);
 			
 			ToHyperlink (hwndDlg, IDC_LINK_HIDVOL_PROTECTION_INFO);
 
 		}
 		return 0;
 
 	case WM_CONTEXTMENU:
 		{
@@ -3174,17 +3174,17 @@ BOOL CALLBACK MountOptionsDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 					(LPSTR) mountOptions->ProtectedHidVolPassword.Text,
 					sizeof (mountOptions->ProtectedHidVolPassword.Text));
 
 				mountOptions->ProtectedHidVolPassword.Length = (unsigned __int32) strlen ((char *) mountOptions->ProtectedHidVolPassword.Text);
 
 				mountOptions->ProtectedHidVolPkcs5Prf = (int) SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETITEMDATA, 
 					SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETCURSEL, 0, 0), 0);
 
-				mountOptions->ProtectedHidVolPin = GetPin (hwndDlg, IDC_PIN);
+				mountOptions->ProtectedHidVolPin = GetPin (hwndDlg, IDC_PIM);
 			}
 
 			// Cleanup
 			memset (tmp, 'X', MAX_PASSWORD);
 			tmp[MAX_PASSWORD] = 0;
 			SetWindowText (GetDlgItem (hwndDlg, IDC_PASSWORD_PROT_HIDVOL), tmp);	
 
 			if ((mountOptions->ProtectHiddenVolume && !bEnableBkgTask)
@@ -3213,19 +3213,19 @@ BOOL CALLBACK MountOptionsDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 
 			EnableWindow (GetDlgItem (hwndDlg, IDC_PASSWORD_PROT_HIDVOL), protect);
 			EnableWindow (GetDlgItem (hwndDlg, IDT_HIDDEN_PROT_PASSWD), protect);
 			EnableWindow (GetDlgItem (hwndDlg, IDC_SHOW_PASSWORD_MO), protect);
 			EnableWindow (GetDlgItem (hwndDlg, IDC_KEYFILES_HIDVOL_PROT), protect);
 			EnableWindow (GetDlgItem (hwndDlg, IDC_KEYFILES_ENABLE_HIDVOL_PROT), protect);
 			EnableWindow (GetDlgItem (hwndDlg, IDT_PKCS5_PRF), protect);
 			EnableWindow (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), protect);
-			EnableWindow (GetDlgItem (hwndDlg, IDT_PIN), protect);
-			EnableWindow (GetDlgItem (hwndDlg, IDC_PIN), protect);
-			EnableWindow (GetDlgItem (hwndDlg, IDC_PIN_HELP), protect);
+			EnableWindow (GetDlgItem (hwndDlg, IDT_PIM), protect);
+			EnableWindow (GetDlgItem (hwndDlg, IDC_PIM), protect);
+			EnableWindow (GetDlgItem (hwndDlg, IDC_PIM_HELP), protect);
 
 			return 1;
 		}
 
 		return 0;
 	}
 
 	return 0;
diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc
index 135cdd77..e7ef8e19 100644
--- a/src/Mount/Mount.rc
+++ b/src/Mount/Mount.rc
@@ -109,42 +109,42 @@ IDD_PASSWORDCHANGE_DLG DIALOGEX 0, 0, 330, 245
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Change Password or Keyfiles"
 CLASS "VeraCryptCustomDlg"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     EDITTEXT        IDC_OLD_PASSWORD,89,14,162,13,ES_PASSWORD | ES_AUTOHSCROLL
     COMBOBOX        IDC_PKCS5_OLD_PRF_ID,89,33,85,90,CBS_DROPDOWNLIST | WS_TABSTOP
     CONTROL         "TrueCrypt Mode",IDC_TRUECRYPT_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,179,35,78,10
-    EDITTEXT        IDC_OLD_PIN,89,51,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
+    EDITTEXT        IDC_OLD_PIM,89,51,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
     CONTROL         "Use keyfiles",IDC_ENABLE_KEYFILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,72,98,10
     PUSHBUTTON      "Keyfiles...",IDC_KEYFILES,192,70,59,14
     CONTROL         "Display password",IDC_SHOW_PASSWORD_CHPWD_ORI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,85,138,10,WS_EX_TRANSPARENT
     EDITTEXT        IDC_PASSWORD,89,121,162,13,ES_PASSWORD | ES_AUTOHSCROLL
     EDITTEXT        IDC_VERIFY,89,137,162,13,ES_PASSWORD | ES_AUTOHSCROLL
-    EDITTEXT        IDC_PIN,89,154,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
+    EDITTEXT        IDC_PIM,89,154,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
     CONTROL         "Use keyfiles",IDC_ENABLE_NEW_KEYFILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,172,99,11
     PUSHBUTTON      "Keyfiles...",IDC_NEW_KEYFILES,192,170,59,14
     CONTROL         "Display password",IDC_SHOW_PASSWORD_CHPWD_NEW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,184,160,11,WS_EX_TRANSPARENT
     COMBOBOX        IDC_PKCS5_PRF_ID,89,199,85,90,CBS_DROPDOWNLIST | WS_TABSTOP
     COMBOBOX        IDC_WIPE_MODE,89,218,106,90,CBS_DROPDOWNLIST | WS_TABSTOP
     DEFPUSHBUTTON   "OK",IDOK,264,7,59,14
     PUSHBUTTON      "Cancel",IDCANCEL,264,24,59,14
     RTEXT           "Password:",IDT_PASSWORD,12,16,72,8
     RTEXT           "Password:",IDT_NEW_PASSWORD,8,124,76,8
     RTEXT           "Confirm Password:",IDT_CONFIRM_PASSWORD,9,140,75,16
     RTEXT           "PKCS-5 PRF:",IDT_NEW_PKCS5_PRF,9,200,74,10,SS_CENTERIMAGE
     GROUPBOX        "Current",IDT_CURRENT,6,3,252,97
     GROUPBOX        "New",IDT_NEW,6,108,252,130
     RTEXT           "Wipe mode:",IDT_WIPE_MODE,9,220,74,8,0,WS_EX_RIGHT
     RTEXT           "PKCS-5 PRF:",IDT_PKCS5_PRF,12,34,74,10,SS_CENTERIMAGE
-    RTEXT           "Volume PIN:",IDT_OLD_PIN,12,54,74,10
-    LTEXT           "(Empty or 0 for default iterations)",IDC_OLD_PIN_HELP,135,54,119,8
-    RTEXT           "Volume PIN:",IDT_PIN,9,157,75,16
-    LTEXT           "(Empty or 0 for default iterations)",IDC_PIN_HELP,135,157,119,8
+    RTEXT           "Volume PIM:",IDT_OLD_PIM,12,54,74,10
+    LTEXT           "(Empty or 0 for default iterations)",IDC_OLD_PIM_HELP,135,54,119,8
+    RTEXT           "Volume PIM:",IDT_PIM,9,157,75,16
+    LTEXT           "(Empty or 0 for default iterations)",IDC_PIM_HELP,135,157,119,8
 END
 
 IDD_MOUNT_DLG DIALOGEX 0, 0, 375, 271
 STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "VeraCrypt"
 MENU IDR_MENU
 CLASS "VeraCryptCustomDlg"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -175,29 +175,29 @@ END
 IDD_PASSWORD_DLG DIALOGEX 0, 0, 322, 103
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "Enter VeraCrypt Volume Password"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     EDITTEXT        IDC_PASSWORD,69,8,166,14,ES_PASSWORD | ES_AUTOHSCROLL
     COMBOBOX        IDC_PKCS5_PRF_ID,69,26,86,90,CBS_DROPDOWNLIST | WS_TABSTOP
     CONTROL         "TrueCrypt Mode",IDC_TRUECRYPT_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,28,76,10
-    EDITTEXT        IDC_PIN,69,43,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
+    EDITTEXT        IDC_PIM,69,43,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
     CONTROL         "Cache passwords and keyfil&es in memory",IDC_CACHE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,70,61,153,10
     CONTROL         "&Display password",IDC_SHOW_PASSWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,70,74,83,10
     CONTROL         "U&se keyfiles",IDC_KEYFILES_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,70,87,83,11
     PUSHBUTTON      "&Keyfiles...",IDC_KEY_FILES,171,84,64,14
     PUSHBUTTON      "Mount Opti&ons...",IDC_MOUNT_OPTIONS,243,84,64,14
     DEFPUSHBUTTON   "OK",IDOK,243,8,64,14
     PUSHBUTTON      "Cancel",IDCANCEL,243,25,64,14
     RTEXT           "Password:",IDT_PASSWORD,0,10,65,13
     RTEXT           "PKCS-5 PRF:",IDT_PKCS5_PRF,0,27,65,11
-    RTEXT           "Volume PIN:",IDT_PIN,0,46,65,8
-    LTEXT           "(Empty or 0 for default iterations)",IDC_PIN_HELP,115,46,189,8
+    RTEXT           "Volume PIM:",IDT_PIM,0,46,65,8
+    LTEXT           "(Empty or 0 for default iterations)",IDC_PIM_HELP,115,46,189,8
 END
 
 IDD_TRAVELER_DLG DIALOGEX 0, 0, 300, 269
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "VeraCrypt Traveler Disk Setup"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     EDITTEXT        IDC_DIRECTORY,17,29,205,13,ES_AUTOHSCROLL
@@ -335,19 +335,19 @@ BEGIN
     CONTROL         "Do not mount selected volume when 'Mount Favorite Volumes' &hot key is pressed",IDC_FAVORITE_DISABLE_HOTKEY,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,264,349,11
     LTEXT           "Help on favorite volumes",IDC_FAVORITES_HELP_LINK,17,298,237,10,SS_NOTIFY
     DEFPUSHBUTTON   "OK",IDOK,269,296,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,323,296,50,14
     GROUPBOX        "",IDC_FAV_VOL_OPTIONS_GROUP_BOX,7,122,366,159
     LTEXT           "Label of selected favorite volume:",IDT_FAVORITE_LABEL,18,163,202,8
     GROUPBOX        "Global Settings",IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX,7,230,366,57
-    EDITTEXT        IDC_PIN,16,143,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "(Empty or 0 for default iterations)",IDC_PIN_HELP,64,145,189,8
-    LTEXT           "Volume PIN:",IDT_PIN,18,133,65,8
+    EDITTEXT        IDC_PIM,16,143,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "(Empty or 0 for default iterations)",IDC_PIM_HELP,64,145,189,8
+    LTEXT           "Volume PIM:",IDT_PIM,18,133,65,8
 END
 
 IDD_DEFAULT_MOUNT_PARAMETERS DIALOGEX 0, 0, 167, 65
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "VeraCrypt - Mount Parameters"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,57,44,50,14
diff --git a/src/Mount/Resource.h b/src/Mount/Resource.h
index 05109fcc..e8b4512a 100644
--- a/src/Mount/Resource.h
+++ b/src/Mount/Resource.h
@@ -158,19 +158,19 @@
 #define IDC_FAV_VOL_OPTIONS_GROUP_BOX   1134
 #define IDC_FAVORITES_HELP_LINK         1135
 #define IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX 1136
 #define IDC_PREF_DISMOUNT_SESSION_LOCKED 1137
 #define IDT_NEW_PKCS5_PRF               1138
 #define IDC_PKCS5_OLD_PRF_ID            1139
 #define IDC_TRUECRYPT_MODE              1140
 #define IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT 1141
-#define IDT_OLD_PIN                     1142
-#define IDC_OLD_PIN                     1143
-#define IDC_OLD_PIN_HELP                1144
+#define IDT_OLD_PIM                     1142
+#define IDC_OLD_PIM                     1143
+#define IDC_OLD_PIM_HELP                1144
 #define IDM_HELP                        40001
 #define IDM_ABOUT                       40002
 #define IDM_UNMOUNT_VOLUME              40003
 #define IDM_CLEAR_HISTORY               40004
 #define IDM_BENCHMARK                   40005
 #define IDM_TRAVELER                    40006
 #define IDM_MOUNT_VOLUME_OPTIONS        40007
 #define IDM_FAQ                         40008