8 files changed, 173 insertions, 173 deletions
diff --git a/src/Setup/ComSetup.cpp b/src/Setup/ComSetup.cpp
index 1608bcea..25d16a02 100644
--- a/src/Setup/ComSetup.cpp
+++ b/src/Setup/ComSetup.cpp
@@ -29,8 +29,8 @@ extern "C" BOOL RegisterComServers (char *modulePath)
 	wchar_t mainModule[1024], formatModule[1024];
 	CComPtr<ITypeLib> tl, tl2;
 
-	wsprintfW (mainModule, L"%hsTrueCrypt.exe", modulePath);
-	wsprintfW (formatModule, L"%hsTrueCrypt Format.exe", modulePath);
+	wsprintfW (mainModule, L"%hsVeraCrypt.exe", modulePath);
+	wsprintfW (formatModule, L"%hsVeraCrypt Format.exe", modulePath);
 
 	UnRegisterTypeLib (LIBID_TrueCryptMainCom, TC_MAIN_COM_VERSION_MAJOR, TC_MAIN_COM_VERSION_MINOR, 0, SYS_WIN32);
 	UnRegisterTypeLib (LIBID_TrueCryptFormatCom, TC_FORMAT_COM_VERSION_MAJOR, TC_FORMAT_COM_VERSION_MINOR, 0, SYS_WIN32);
@@ -72,10 +72,10 @@ extern "C" BOOL UnregisterComServers (char *modulePath)
 	CRegObject ro;
 	ro.FinalConstruct ();
 
-	wsprintfW (module, L"%hsTrueCrypt.exe", modulePath);
+	wsprintfW (module, L"%hsVeraCrypt.exe", modulePath);
 	ro.AddReplacement (L"MAIN_MODULE", module);
 
-	wsprintfW (module, L"%hsTrueCrypt Format.exe", modulePath);
+	wsprintfW (module, L"%hsVeraCrypt Format.exe", modulePath);
 	ro.AddReplacement (L"FORMAT_MODULE", module);
 
 	wchar_t setupModule[MAX_PATH];
diff --git a/src/Setup/ComSetup.rgs b/src/Setup/ComSetup.rgs
index a1cf61f5..19ee8be7 100644
--- a/src/Setup/ComSetup.rgs
+++ b/src/Setup/ComSetup.rgs
@@ -1,25 +1,25 @@
 HKCR
 {
-	ForceRemove TrueCrypt.1 = s 'TrueCrypt class'
+	ForceRemove VeraCrypt.1 = s 'VeraCrypt class'
 	{
-		CLSID = s '{CECBC0EE-78D9-41E6-BCF1-BC222BB224BA}'
+		CLSID = s '{FE8B3B95-C80C-41f7-830F-FBA271C26F7E}'
 	}
 
-	ForceRemove TrueCrypt = s 'TrueCrypt class'
+	ForceRemove VeraCrypt = s 'VeraCrypt class'
 	{
-		CLSID = s '{CECBC0EE-78D9-41E6-BCF1-BC222BB224BA}'
-		CurVer = s 'TrueCrypt.1'
+		CLSID = s '{FE8B3B95-C80C-41f7-830F-FBA271C26F7E}'
+		CurVer = s 'VeraCrypt.1'
 	}
 
 	NoRemove CLSID
 	{
-		ForceRemove {CECBC0EE-78D9-41E6-BCF1-BC222BB224BA} = s 'TrueCrypt class'
+		ForceRemove {FE8B3B95-C80C-41f7-830F-FBA271C26F7E} = s 'VeraCrypt class'
 		{
-			ProgID = s 'TrueCrypt.1'
-			VersionIndependentProgID = s 'TrueCrypt'
+			ProgID = s 'VeraCrypt.1'
+			VersionIndependentProgID = s 'VeraCrypt'
 			LocalServer32 = s '"%MAIN_MODULE%"'
 
-			TypeLib = s '{1770F56C-7881-4591-A179-79B8001C7D42}'
+			TypeLib = s '{9ACF6176-5FC4-4690-A025-B3306A50EB6A}'
 			
 			Elevation
             {
@@ -27,44 +27,44 @@ HKCR
 				val IconReference = s '@%MAIN_MODULE%,-501'
             }
 
-			val AppId = s '{CECBC0EE-78D9-41E6-BCF1-BC222BB224BA}'
+			val AppId = s '{FE8B3B95-C80C-41f7-830F-FBA271C26F7E}'
             val LocalizedString = s '@%MAIN_MODULE%,-110'
 		}
 	}
 
 	NoRemove AppId
 	{
-		ForceRemove {CECBC0EE-78D9-41E6-BCF1-BC222BB224BA} = s 'TrueCrypt class'
+		ForceRemove {FE8B3B95-C80C-41f7-830F-FBA271C26F7E} = s 'VeraCrypt class'
 		{
 			val AccessPermission = b 010004803000000040000000000000001400000002001c000100000000001400070000000101000000000005040000000102000000000005200000002002000001020000000000052000000020020000
 		}
 		
-		ForceRemove TrueCrypt.exe
+		ForceRemove VeraCrypt.exe
 		{
-			val AppId = s '{CECBC0EE-78D9-41E6-BCF1-BC222BB224BA}'
+			val AppId = s '{FE8B3B95-C80C-41f7-830F-FBA271C26F7E}'
 		}
 	}
 	
-	ForceRemove TrueCryptFormat.1 = s 'TrueCryptFormat class'
+	ForceRemove VeraCryptFormat.1 = s 'VeraCryptFormat class'
 	{
-		CLSID = s '{777DCDFD-C330-480B-B582-B02B57580CC9}'
+		CLSID = s '{A96D3797-9F31-49f4-A0CE-9657392CF789}'
 	}
 
-	ForceRemove TrueCryptFormat = s 'TrueCryptFormat class'
+	ForceRemove VeraCryptFormat = s 'VeraCryptFormat class'
 	{
-		CLSID = s '{777DCDFD-C330-480B-B582-B02B57580CC9}'
-		CurVer = s 'TrueCryptFormat.1'
+		CLSID = s '{A96D3797-9F31-49f4-A0CE-9657392CF789}'
+		CurVer = s 'VeraCryptFormat.1'
 	}
 	
 	NoRemove CLSID
 	{
-		ForceRemove {777DCDFD-C330-480B-B582-B02B57580CC9} = s 'TrueCryptFormat class'
+		ForceRemove {A96D3797-9F31-49f4-A0CE-9657392CF789} = s 'VeraCryptFormat class'
 		{
-			ProgID = s 'TrueCryptFormat.1'
-			VersionIndependentProgID = s 'TrueCryptFormat'
+			ProgID = s 'VeraCryptFormat.1'
+			VersionIndependentProgID = s 'VeraCryptFormat'
 			LocalServer32 = s '"%FORMAT_MODULE%"'
 
-			TypeLib = s '{A7DF958C-0716-49E9-8C3E-53A775797576}'
+			TypeLib = s '{56327DDA-F1A7-4e13-B128-520D129BDEF6}'
 			
 			Elevation
             {
@@ -72,21 +72,21 @@ HKCR
 				val IconReference = s '@%FORMAT_MODULE%,-501'
             }
 
-			val AppId = s '{777DCDFD-C330-480B-B582-B02B57580CC9}'
+			val AppId = s '{A96D3797-9F31-49f4-A0CE-9657392CF789}'
             val LocalizedString = s '@%FORMAT_MODULE%,-112'
 		}
 	}
 	
 	NoRemove AppId
 	{
-		ForceRemove {777DCDFD-C330-480B-B582-B02B57580CC9} = s 'TrueCryptFormat class'
+		ForceRemove {A96D3797-9F31-49f4-A0CE-9657392CF789} = s 'VeraCryptFormat class'
 		{
 			val AccessPermission = b 010004803000000040000000000000001400000002001c000100000000001400070000000101000000000005040000000102000000000005200000002002000001020000000000052000000020020000
 		}
 		
-		ForceRemove 'TrueCrypt Format.exe'
+		ForceRemove 'VeraCrypt Format.exe'
 		{
-			val AppId = s '{777DCDFD-C330-480B-B582-B02B57580CC9}'
+			val AppId = s '{A96D3797-9F31-49f4-A0CE-9657392CF789}'
 		}
 	}
 }
 \ No newline at end of file
diff --git a/src/Setup/SelfExtract.c b/src/Setup/SelfExtract.c
index 7377da4a..5be9cd21 100644
--- a/src/Setup/SelfExtract.c
+++ b/src/Setup/SelfExtract.c
@@ -19,7 +19,7 @@
 #include "Language.h"
 #include "Resource.h"
 
-#define OutputPackageFile "TrueCrypt Setup " VERSION_STRING ".exe"
+#define OutputPackageFile "VeraCrypt Setup " VERSION_STRING ".exe"
 
 #define MAG_START_MARKER	"TCINSTRT"
 #define MAG_END_MARKER_OBFUSCATED	"T/C/I/N/S/C/R/C"
@@ -57,19 +57,19 @@ static void DeobfuscateMagEndMarker (void)
 
 static void PkgError (char *msg)
 {
-	MessageBox (NULL, msg, "TrueCrypt", MB_ICONERROR | MB_SETFOREGROUND | MB_TOPMOST);
+	MessageBox (NULL, msg, "VeraCrypt", MB_ICONERROR | MB_SETFOREGROUND | MB_TOPMOST);
 }
 
 
 static void PkgWarning (char *msg)
 {
-	MessageBox (NULL, msg, "TrueCrypt", MB_ICONWARNING | MB_SETFOREGROUND | MB_TOPMOST);
+	MessageBox (NULL, msg, "VeraCrypt", MB_ICONWARNING | MB_SETFOREGROUND | MB_TOPMOST);
 }
 
 
 static void PkgInfo (char *msg)
 {
-	MessageBox (NULL, msg, "TrueCrypt", MB_ICONINFORMATION | MB_SETFOREGROUND | MB_TOPMOST);
+	MessageBox (NULL, msg, "VeraCrypt", MB_ICONINFORMATION | MB_SETFOREGROUND | MB_TOPMOST);
 }
 
 
@@ -165,7 +165,7 @@ static int CompressBuffer (char *out, char *in, int len)
 
 	if (!CreateProcess (NULL, "gzip --best", NULL, NULL, TRUE, 0, NULL, NULL, &startupInfo, &procInfo))
 	{
-		PkgError ("Error: Cannot run gzip.\n\nBefore you can create a self-extracting TrueCrypt package, you need to have the open-source 'gzip' compression tool placed in any directory in the search path for executable files (for example, in 'C:\\Windows\\').\n\nNote: gzip can be freely downloaded e.g. from www.gzip.org");
+		PkgError ("Error: Cannot run gzip.\n\nBefore you can create a self-extracting VeraCrypt package, you need to have the open-source 'gzip' compression tool placed in any directory in the search path for executable files (for example, in 'C:\\Windows\\').\n\nNote: gzip can be freely downloaded e.g. from www.gzip.org");
 		return 0;
 	}
 
@@ -236,12 +236,12 @@ BOOL MakeSelfExtractingPackage (HWND hwndDlg, char *szDestDir)
 	strcpy (outputFile, szDestDir);
 	strncat (outputFile, OutputPackageFile, sizeof (outputFile) - strlen (outputFile) - 1);
 
-	// Clone 'TrueCrypt Setup.exe' to create the base of the new self-extracting archive
+	// Clone 'VeraCrypt Setup.exe' to create the base of the new self-extracting archive
 
 	if (!TCCopyFile (inputFile, outputFile))
 	{
 		handleWin32Error (hwndDlg);
-		PkgError ("Cannot copy 'TrueCrypt Setup.exe' to the package");
+		PkgError ("Cannot copy 'VeraCrypt Setup.exe' to the package");
 		goto err;
 	}
 
diff --git a/src/Setup/Setup.c b/src/Setup/Setup.c
index f607ab00..b594642d 100644
--- a/src/Setup/Setup.c
+++ b/src/Setup/Setup.c
@@ -4,9 +4,9 @@
  Copyright (c) 1998-2000 Paul Le Roux and which is governed by the 'License
  Agreement for Encryption for the Masses'. Modifications and additions to
  the original source code (contained in this file) and all other portions
- of this file are Copyright (c) 2003-2012 TrueCrypt Developers Association
+ of this file are Copyright (c) 2003-2012 VeraCrypt Developers Association
  and are governed by the TrueCrypt License 3.0 the full text of which is
- contained in the file License.txt included in TrueCrypt binary and source
+ contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages. */
 
 #include "Tcdefs.h"
@@ -306,7 +306,7 @@ BOOL DoFilesInstall (HWND hwndDlg, char *szDestDir)
 		BOOL bResult;
 		char szDir[TC_MAX_PATH];
 
-		if (strstr (szFiles[i], "TrueCrypt Setup") != 0)
+		if (strstr (szFiles[i], "VeraCrypt Setup") != 0)
 		{
 			if (bUninstall)
 				continue;	// Prevent 'access denied' error
@@ -344,9 +344,9 @@ BOOL DoFilesInstall (HWND hwndDlg, char *szDestDir)
 		{
 			SetCurrentDirectory (SetupFilesDir);
 
-			if (strstr (szFiles[i], "TrueCrypt Setup") != 0)
+			if (strstr (szFiles[i], "VeraCrypt Setup") != 0)
 			{
-				// Copy ourselves (the distribution package) to the destination location as 'TrueCrypt Setup.exe'
+				// Copy ourselves (the distribution package) to the destination location as 'VeraCrypt Setup.exe'
 
 				char mp[MAX_PATH];
 
@@ -361,7 +361,7 @@ BOOL DoFilesInstall (HWND hwndDlg, char *szDestDir)
 				curFileName [strlen (szFiles[i]) - 1] = 0;
 
 				if (Is64BitOs ()
-					&& strcmp (szFiles[i], "Dtruecrypt.sys") == 0)
+					&& strcmp (szFiles[i], "Dveracrypt.sys") == 0)
 				{
 					driver64 = TRUE;
 					strncpy (curFileName, FILENAME_64BIT_DRIVER, sizeof (FILENAME_64BIT_DRIVER));
@@ -409,7 +409,7 @@ BOOL DoFilesInstall (HWND hwndDlg, char *szDestDir)
 
 								if (bUpgrade && InstalledVersion < 0x700)
 								{
-									bResult = WriteLocalMachineRegistryString ("SYSTEM\\CurrentControlSet\\Services\\truecrypt", "ImagePath", "System32\\drivers\\truecrypt.sys", TRUE);
+									bResult = WriteLocalMachineRegistryString ("SYSTEM\\CurrentControlSet\\Services\\veracrypt", "ImagePath", "System32\\drivers\\veracrypt.sys", TRUE);
 									if (!bResult)
 									{
 										handleWin32Error (hwndDlg);
@@ -435,7 +435,7 @@ BOOL DoFilesInstall (HWND hwndDlg, char *szDestDir)
 						EnableWow64FsRedirection (TRUE);
 				}
 
-				if (bResult && strcmp (szFiles[i], "ATrueCrypt.exe") == 0)
+				if (bResult && strcmp (szFiles[i], "AVeraCrypt.exe") == 0)
 				{
 					string servicePath = GetServiceConfigPath (TC_APP_NAME ".exe");
 					if (FileExists (servicePath.c_str()))
@@ -501,7 +501,7 @@ err:
 
 		SetCurrentDirectory (SetupFilesDir);
 		SetCurrentDirectory ("Setup files");
-		h = FindFirstFile ("TrueCrypt User Guide.*.pdf", &f);
+		h = FindFirstFile ("VeraCrypt User Guide.*.pdf", &f);
 		if (h != INVALID_HANDLE_VALUE)
 		{
 			char d[MAX_PATH*2];
@@ -527,7 +527,7 @@ BOOL DoRegInstall (HWND hwndDlg, char *szDestDir, BOOL bInstallType)
 
 	if (SystemEncryptionUpdate)
 	{
-		if (RegCreateKeyEx (HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\TrueCrypt",
+		if (RegCreateKeyEx (HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\VeraCrypt",
 			0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, &dw) == ERROR_SUCCESS)
 		{
 			strcpy (szTmp, VERSION_STRING);
@@ -555,14 +555,14 @@ BOOL DoRegInstall (HWND hwndDlg, char *szDestDir, BOOL bInstallType)
 	if (bInstallType)
 	{
 
-		key = "Software\\Classes\\TrueCryptVolume";
+		key = "Software\\Classes\\VeraCryptVolume";
 		RegMessage (hwndDlg, key);
 		if (RegCreateKeyEx (HKEY_LOCAL_MACHINE,
 				    key,
 				    0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, &dw) != ERROR_SUCCESS)
 			goto error;
 
-		strcpy (szTmp, "TrueCrypt Volume");
+		strcpy (szTmp, "VeraCrypt Volume");
 		if (RegSetValueEx (hkey, "", 0, REG_SZ, (BYTE *) szTmp, strlen (szTmp) + 1) != ERROR_SUCCESS)
 			goto error;
 
@@ -573,40 +573,40 @@ BOOL DoRegInstall (HWND hwndDlg, char *szDestDir, BOOL bInstallType)
 		RegCloseKey (hkey);
 		hkey = 0;
 
-		key = "Software\\Classes\\TrueCryptVolume\\DefaultIcon";
+		key = "Software\\Classes\\VeraCryptVolume\\DefaultIcon";
 		RegMessage (hwndDlg, key);
 		if (RegCreateKeyEx (HKEY_LOCAL_MACHINE,
 				    key,
 				    0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, &dw) != ERROR_SUCCESS)
 			goto error;
 
-		sprintf (szTmp, "%sTrueCrypt.exe,1", szDir);
+		sprintf (szTmp, "%sVeraCrypt.exe,1", szDir);
 		if (RegSetValueEx (hkey, "", 0, REG_SZ, (BYTE *) szTmp, strlen (szTmp) + 1) != ERROR_SUCCESS)
 			goto error;
 
 		RegCloseKey (hkey);
 		hkey = 0;
 
-		key = "Software\\Classes\\TrueCryptVolume\\Shell\\open\\command";
+		key = "Software\\Classes\\VeraCryptVolume\\Shell\\open\\command";
 		RegMessage (hwndDlg, key);
 		if (RegCreateKeyEx (HKEY_LOCAL_MACHINE,
 				    key,
 				    0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, &dw) != ERROR_SUCCESS)
 			goto error;
 
-		sprintf (szTmp, "\"%sTrueCrypt.exe\" /v \"%%1\"", szDir );
+		sprintf (szTmp, "\"%sVeraCrypt.exe\" /v \"%%1\"", szDir );
 		if (RegSetValueEx (hkey, "", 0, REG_SZ, (BYTE *) szTmp, strlen (szTmp) + 1) != ERROR_SUCCESS)
 			goto error;
 
 		RegCloseKey (hkey);
 		hkey = 0;
 
-		key = "Software\\Classes\\.tc";
+		key = "Software\\Classes\\.hc";
 		BOOL typeClassChanged = TRUE;
 		char typeClass[256];
 		DWORD typeClassSize = sizeof (typeClass);
 
-		if (ReadLocalMachineRegistryString (key, "", typeClass, &typeClassSize) && typeClassSize > 0 && strcmp (typeClass, "TrueCryptVolume") == 0)
+		if (ReadLocalMachineRegistryString (key, "", typeClass, &typeClassSize) && typeClassSize > 0 && strcmp (typeClass, "VeraCryptVolume") == 0)
 			typeClassChanged = FALSE;
 
 		RegMessage (hwndDlg, key);
@@ -615,7 +615,7 @@ BOOL DoRegInstall (HWND hwndDlg, char *szDestDir, BOOL bInstallType)
 				    0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, &dw) != ERROR_SUCCESS)
 			goto error;
 
-		strcpy (szTmp, "TrueCryptVolume");
+		strcpy (szTmp, "VeraCryptVolume");
 		if (RegSetValueEx (hkey, "", 0, REG_SZ, (BYTE *) szTmp, strlen (szTmp) + 1) != ERROR_SUCCESS)
 			goto error;
 		
@@ -626,7 +626,7 @@ BOOL DoRegInstall (HWND hwndDlg, char *szDestDir, BOOL bInstallType)
 			SHChangeNotify (SHCNE_ASSOCCHANGED, SHCNF_IDLIST, NULL, NULL);
 	}
 
-	key = "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\TrueCrypt";
+	key = "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\VeraCrypt";
 	RegMessage (hwndDlg, key);
 	if (RegCreateKeyEx (HKEY_LOCAL_MACHINE,
 		key,
@@ -634,15 +634,15 @@ BOOL DoRegInstall (HWND hwndDlg, char *szDestDir, BOOL bInstallType)
 		goto error;
 
 	/* IMPORTANT: IF YOU CHANGE THIS IN ANY WAY, REVISE AND UPDATE SetInstallationPath() ACCORDINGLY! */ 
-	sprintf (szTmp, "\"%sTrueCrypt Setup.exe\" /u", szDir);
+	sprintf (szTmp, "\"%sVeraCrypt Setup.exe\" /u", szDir);
 	if (RegSetValueEx (hkey, "UninstallString", 0, REG_SZ, (BYTE *) szTmp, strlen (szTmp) + 1) != ERROR_SUCCESS)
 		goto error;
 
-	sprintf (szTmp, "\"%sTrueCrypt Setup.exe\" /c", szDir);
+	sprintf (szTmp, "\"%sVeraCrypt Setup.exe\" /c", szDir);
 	if (RegSetValueEx (hkey, "ModifyPath", 0, REG_SZ, (BYTE *) szTmp, strlen (szTmp) + 1) != ERROR_SUCCESS)
 		goto error;
 
-	sprintf (szTmp, "\"%sTrueCrypt Setup.exe\"", szDir);
+	sprintf (szTmp, "\"%sVeraCrypt Setup.exe\"", szDir);
 	if (RegSetValueEx (hkey, "DisplayIcon", 0, REG_SZ, (BYTE *) szTmp, strlen (szTmp) + 1) != ERROR_SUCCESS)
 		goto error;
 
@@ -650,11 +650,11 @@ BOOL DoRegInstall (HWND hwndDlg, char *szDestDir, BOOL bInstallType)
 	if (RegSetValueEx (hkey, "DisplayVersion", 0, REG_SZ, (BYTE *) szTmp, strlen (szTmp) + 1) != ERROR_SUCCESS)
 		goto error;
 		
-	strcpy (szTmp, "TrueCrypt");
+	strcpy (szTmp, "VeraCrypt");
 	if (RegSetValueEx (hkey, "DisplayName", 0, REG_SZ, (BYTE *) szTmp, strlen (szTmp) + 1) != ERROR_SUCCESS)
 		goto error;
 
-	strcpy (szTmp, "TrueCrypt Foundation");
+	strcpy (szTmp, "VeraCrypt Foundation");
 	if (RegSetValueEx (hkey, "Publisher", 0, REG_SZ, (BYTE *) szTmp, strlen (szTmp) + 1) != ERROR_SUCCESS)
 		goto error;
 
@@ -696,7 +696,7 @@ BOOL DoApplicationDataUninstall (HWND hwndDlg)
 	StatusMessage (hwndDlg, "REMOVING_APPDATA");
 
 	SHGetFolderPath (NULL, CSIDL_APPDATA, NULL, 0, path);
-	strcat (path, "\\TrueCrypt\\");
+	strcat (path, "\\VeraCrypt\\");
 
 	// Delete favorite volumes file
 	sprintf (path2, "%s%s", path, TC_APPD_FILENAME_FAVORITE_VOLUMES);
@@ -724,7 +724,7 @@ BOOL DoApplicationDataUninstall (HWND hwndDlg)
 	StatDeleteFile (path2);
 
 	SHGetFolderPath (NULL, CSIDL_APPDATA, NULL, 0, path);
-	strcat (path, "\\TrueCrypt");
+	strcat (path, "\\VeraCrypt");
 	RemoveMessage (hwndDlg, path);
 	if (!StatRemoveDirectory (path))
 	{
@@ -750,20 +750,20 @@ BOOL DoRegUninstall (HWND hwndDlg, BOOL bRemoveDeprecated)
 	if (!bRemoveDeprecated)
 		StatusMessage (hwndDlg, "REMOVING_REG");
 
-	RegDeleteKey (HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\TrueCrypt");
-	RegDeleteKey (HKEY_LOCAL_MACHINE, "Software\\Classes\\TrueCryptVolume\\Shell\\open\\command");
-	RegDeleteKey (HKEY_LOCAL_MACHINE, "Software\\Classes\\TrueCryptVolume\\Shell\\open");
-	RegDeleteKey (HKEY_LOCAL_MACHINE, "Software\\Classes\\TrueCryptVolume\\Shell");
-	RegDeleteKey (HKEY_LOCAL_MACHINE, "Software\\Classes\\TrueCryptVolume\\DefaultIcon");
-	RegDeleteKey (HKEY_LOCAL_MACHINE, "Software\\Classes\\TrueCryptVolume");
-	RegDeleteKey (HKEY_CURRENT_USER, "Software\\TrueCrypt");
+	RegDeleteKey (HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\VeraCrypt");
+	RegDeleteKey (HKEY_LOCAL_MACHINE, "Software\\Classes\\VeraCryptVolume\\Shell\\open\\command");
+	RegDeleteKey (HKEY_LOCAL_MACHINE, "Software\\Classes\\VeraCryptVolume\\Shell\\open");
+	RegDeleteKey (HKEY_LOCAL_MACHINE, "Software\\Classes\\VeraCryptVolume\\Shell");
+	RegDeleteKey (HKEY_LOCAL_MACHINE, "Software\\Classes\\VeraCryptVolume\\DefaultIcon");
+	RegDeleteKey (HKEY_LOCAL_MACHINE, "Software\\Classes\\VeraCryptVolume");
+	RegDeleteKey (HKEY_CURRENT_USER, "Software\\VeraCrypt");
 
 	if (!bRemoveDeprecated)
 	{
 		GetStartupRegKeyName (regk);
-		DeleteRegistryValue (regk, "TrueCrypt");
+		DeleteRegistryValue (regk, "VeraCrypt");
 
-		RegDeleteKey (HKEY_LOCAL_MACHINE, "Software\\Classes\\.tc");
+		RegDeleteKey (HKEY_LOCAL_MACHINE, "Software\\Classes\\.hc");
 		SHChangeNotify (SHCNE_ASSOCCHANGED, SHCNF_IDLIST, NULL, NULL);
 	}
 
@@ -801,7 +801,7 @@ retry:
 	if (hService == NULL)
 		goto error;
 
-	if (strcmp ("truecrypt", lpszService) == 0)
+	if (strcmp ("veracrypt", lpszService) == 0)
 	{
 		try
 		{
@@ -862,7 +862,7 @@ retry:
 
 try_delete:
 
-	if (strcmp ("truecrypt", lpszService) == 0)
+	if (strcmp ("veracrypt", lpszService) == 0)
 		StatusMessage (hwndDlg, "REMOVING_DRIVER");
 	else
 		StatusMessageParam (hwndDlg, "REMOVING", lpszService);
@@ -1068,8 +1068,8 @@ BOOL DoDriverUnload (HWND hwndDlg)
 	else
 	{
 		// Note that the driver may have already been unloaded during this session (e.g. retry after an error, etc.) so it is not 
-		// guaranteed that the user is installing TrueCrypt for the first time now (we also cannot know if the user has already
-		// installed and used TrueCrypt on another system before).
+		// guaranteed that the user is installing VeraCrypt for the first time now (we also cannot know if the user has already
+		// installed and used VeraCrypt on another system before).
 		bPossiblyFirstTimeInstall = TRUE;
 	}
 
@@ -1129,7 +1129,7 @@ BOOL DoShortcutsUninstall (HWND hwndDlg, char *szDestDir)
 	if (bSlash == FALSE)
 		strcat (szLinkDir, "\\");
 
-	strcat (szLinkDir, "TrueCrypt");
+	strcat (szLinkDir, "VeraCrypt");
 
 	// Global start menu
 	{
@@ -1137,7 +1137,7 @@ BOOL DoShortcutsUninstall (HWND hwndDlg, char *szDestDir)
 		char path[TC_MAX_PATH];
 
 		SHGetSpecialFolderPath (hwndDlg, path, CSIDL_COMMON_PROGRAMS, 0);
-		strcat (path, "\\TrueCrypt");
+		strcat (path, "\\VeraCrypt");
 
 		if (_stat (path, &st) == 0)
 		{
@@ -1147,22 +1147,22 @@ BOOL DoShortcutsUninstall (HWND hwndDlg, char *szDestDir)
 	}
 
 	// Start menu entries
-	sprintf (szTmp2, "%s%s", szLinkDir, "\\TrueCrypt.lnk");
+	sprintf (szTmp2, "%s%s", szLinkDir, "\\VeraCrypt.lnk");
 	RemoveMessage (hwndDlg, szTmp2);
 	if (StatDeleteFile (szTmp2) == FALSE)
 		goto error;
 
-	sprintf (szTmp2, "%s%s", szLinkDir, "\\TrueCrypt Website.url");
+	sprintf (szTmp2, "%s%s", szLinkDir, "\\VeraCrypt Website.url");
 	RemoveMessage (hwndDlg, szTmp2);
 	if (StatDeleteFile (szTmp2) == FALSE)
 		goto error;
 
-	sprintf (szTmp2, "%s%s", szLinkDir, "\\Uninstall TrueCrypt.lnk");
+	sprintf (szTmp2, "%s%s", szLinkDir, "\\Uninstall VeraCrypt.lnk");
 	RemoveMessage (hwndDlg, szTmp2);
 	if (StatDeleteFile (szTmp2) == FALSE)
 		goto error;
 	
-	sprintf (szTmp2, "%s%s", szLinkDir, "\\TrueCrypt User's Guide.lnk");
+	sprintf (szTmp2, "%s%s", szLinkDir, "\\VeraCrypt User's Guide.lnk");
 	DeleteFile (szTmp2);
 
 	// Start menu group
@@ -1177,7 +1177,7 @@ BOOL DoShortcutsUninstall (HWND hwndDlg, char *szDestDir)
 	else
 		SHGetSpecialFolderPath (hwndDlg, szLinkDir, CSIDL_DESKTOPDIRECTORY, 0);
 
-	sprintf (szTmp2, "%s%s", szLinkDir, "\\TrueCrypt.lnk");
+	sprintf (szTmp2, "%s%s", szLinkDir, "\\VeraCrypt.lnk");
 
 	RemoveMessage (hwndDlg, szTmp2);
 	if (StatDeleteFile (szTmp2) == FALSE)
@@ -1215,7 +1215,7 @@ BOOL DoShortcutsInstall (HWND hwndDlg, char *szDestDir, BOOL bProgGroup, BOOL bD
 	if (bSlash == FALSE)
 		strcat (szLinkDir, "\\");
 
-	strcat (szLinkDir, "TrueCrypt");
+	strcat (szLinkDir, "VeraCrypt");
 
 	strcpy (szDir, szDestDir);
 	x = strlen (szDestDir);
@@ -1244,14 +1244,14 @@ BOOL DoShortcutsInstall (HWND hwndDlg, char *szDestDir, BOOL bProgGroup, BOOL bD
 			}
 		}
 
-		sprintf (szTmp, "%s%s", szDir, "TrueCrypt.exe");
-		sprintf (szTmp2, "%s%s", szLinkDir, "\\TrueCrypt.lnk");
+		sprintf (szTmp, "%s%s", szDir, "VeraCrypt.exe");
+		sprintf (szTmp2, "%s%s", szLinkDir, "\\VeraCrypt.lnk");
 
 		IconMessage (hwndDlg, szTmp2);
 		if (CreateLink (szTmp, "", szTmp2) != S_OK)
 			goto error;
 
-		sprintf (szTmp2, "%s%s", szLinkDir, "\\TrueCrypt Website.url");
+		sprintf (szTmp2, "%s%s", szLinkDir, "\\VeraCrypt Website.url");
 		IconMessage (hwndDlg, szTmp2);
 		f = fopen (szTmp2, "w");
 		if (f)
@@ -1264,15 +1264,15 @@ BOOL DoShortcutsInstall (HWND hwndDlg, char *szDestDir, BOOL bProgGroup, BOOL bD
 		else
 			goto error;
 
-		sprintf (szTmp, "%s%s", szDir, "TrueCrypt Setup.exe");
-		sprintf (szTmp2, "%s%s", szLinkDir, "\\Uninstall TrueCrypt.lnk");
+		sprintf (szTmp, "%s%s", szDir, "VeraCrypt Setup.exe");
+		sprintf (szTmp2, "%s%s", szLinkDir, "\\Uninstall VeraCrypt.lnk");
 		strcpy (szTmp3, "/u");
 
 		IconMessage (hwndDlg, szTmp2);
 		if (CreateLink (szTmp, szTmp3, szTmp2) != S_OK)
 			goto error;
 
-		sprintf (szTmp2, "%s%s", szLinkDir, "\\TrueCrypt User's Guide.lnk");
+		sprintf (szTmp2, "%s%s", szLinkDir, "\\VeraCrypt User's Guide.lnk");
 		DeleteFile (szTmp2);
 	}
 
@@ -1293,8 +1293,8 @@ BOOL DoShortcutsInstall (HWND hwndDlg, char *szDestDir, BOOL bProgGroup, BOOL bD
 		else
 			SHGetSpecialFolderPath (hwndDlg, szLinkDir, CSIDL_DESKTOPDIRECTORY, 0);
 
-		sprintf (szTmp, "%s%s", szDir, "TrueCrypt.exe");
-		sprintf (szTmp2, "%s%s", szLinkDir, "\\TrueCrypt.lnk");
+		sprintf (szTmp, "%s%s", szDir, "VeraCrypt.exe");
+		sprintf (szTmp2, "%s%s", szLinkDir, "\\VeraCrypt.lnk");
 
 		IconMessage (hwndDlg, szTmp2);
 
@@ -1369,7 +1369,7 @@ static void SetSystemRestorePoint (HWND hwndDlg, BOOL finalize)
 		RestPtInfo.dwEventType = BEGIN_SYSTEM_CHANGE;
 		RestPtInfo.dwRestorePtType = bUninstall ? APPLICATION_UNINSTALL : APPLICATION_INSTALL | DEVICE_DRIVER_INSTALL;
 		RestPtInfo.llSequenceNumber = 0;
-		strcpy (RestPtInfo.szDescription, bUninstall ? "TrueCrypt uninstallation" : "TrueCrypt installation");
+		strcpy (RestPtInfo.szDescription, bUninstall ? "VeraCrypt uninstallation" : "VeraCrypt installation");
 
 		if(!_SRSetRestorePoint (&RestPtInfo, &SMgrStatus)) 
 		{
@@ -1415,7 +1415,7 @@ void DoUninstall (void *arg)
 		if (!Rollback && bSystemRestore && !bTempSkipSysRestore)
 			SetSystemRestorePoint (hwndDlg, FALSE);
 
-		if (DoServiceUninstall (hwndDlg, "truecrypt") == FALSE)
+		if (DoServiceUninstall (hwndDlg, "veracrypt") == FALSE)
 		{
 			bOK = FALSE;
 		}
@@ -1441,10 +1441,10 @@ void DoUninstall (void *arg)
 			FILE *f;
 
 			// Deprecated service
-			DoServiceUninstall (hwndDlg, "TrueCryptService");
+			DoServiceUninstall (hwndDlg, "VeraCryptService");
 
 			GetTempPath (sizeof (temp), temp);
-			_snprintf (UninstallBatch, sizeof (UninstallBatch), "%s\\TrueCrypt-Uninstall.bat", temp);
+			_snprintf (UninstallBatch, sizeof (UninstallBatch), "%s\\VeraCrypt-Uninstall.bat", temp);
 
 			UninstallBatch [sizeof(UninstallBatch)-1] = 0;
 
@@ -1459,8 +1459,8 @@ void DoUninstall (void *arg)
 					"if exist \"%s%s\" goto loop\n"
 					"rmdir \"%s\"\n"
 					"del \"%s\"",
-					InstallationPath, "TrueCrypt Setup.exe",
-					InstallationPath, "TrueCrypt Setup.exe",
+					InstallationPath, "VeraCrypt Setup.exe",
+					InstallationPath, "VeraCrypt Setup.exe",
 					InstallationPath,
 					UninstallBatch
 					);
@@ -1560,7 +1560,7 @@ void DoInstall (void *arg)
 	UpdateProgressBarProc(50);
 
 	// Remove deprecated
-	DoServiceUninstall (hwndDlg, "TrueCryptService");
+	DoServiceUninstall (hwndDlg, "VeraCryptService");
 	
 	UpdateProgressBarProc(55);
 
@@ -1639,12 +1639,12 @@ void DoInstall (void *arg)
 
 					GetStartupRegKeyName (regk);
 
-					ReadRegistryString (regk, "TrueCrypt", "", regVal, sizeof (regVal));
+					ReadRegistryString (regk, "VeraCrypt", "", regVal, sizeof (regVal));
 
 					if (strstr (regVal, "favorites"))
 					{
 						strcat_s (regVal, sizeof (regVal), " /a logon");
-						WriteRegistryString (regk, "TrueCrypt", regVal);
+						WriteRegistryString (regk, "VeraCrypt", regVal);
 					}
 				}
 			}
@@ -1655,10 +1655,10 @@ void DoInstall (void *arg)
 	}
 
 	GetWindowsDirectory (path, sizeof (path));
-	strcat_s (path, sizeof (path), "\\TrueCrypt Setup.exe");
+	strcat_s (path, sizeof (path), "\\VeraCrypt Setup.exe");
 	DeleteFile (path);
 
-	if (UpdateProgressBarProc(63) && UnloadDriver && DoServiceUninstall (hwndDlg, "truecrypt") == FALSE)
+	if (UpdateProgressBarProc(63) && UnloadDriver && DoServiceUninstall (hwndDlg, "veracrypt") == FALSE)
 	{
 		bOK = FALSE;
 	}
@@ -1786,27 +1786,27 @@ void SetInstallationPath (HWND hwndDlg)
 
 	memset (InstallationPath, 0, sizeof (InstallationPath));
 
-	// Determine if TrueCrypt is already installed and try to determine its "Program Files" location
-	if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\TrueCrypt", 0, KEY_READ, &hkey) == ERROR_SUCCESS)
+	// Determine if VeraCrypt is already installed and try to determine its "Program Files" location
+	if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\VeraCrypt", 0, KEY_READ, &hkey) == ERROR_SUCCESS)
 	{
-		/* Default 'UninstallString' registry strings written by past versions of TrueCrypt:
+		/* Default 'UninstallString' registry strings written by past versions of VeraCrypt:
 		------------------------------------------------------------------------------------
-		1.0		C:\WINDOWS\TrueCrypt Setup.exe /u			[optional]
-		1.0a	C:\WINDOWS\TrueCrypt Setup.exe /u			[optional]
-		2.0		C:\WINDOWS\TrueCrypt Setup.exe /u			[optional]
-		2.1		C:\WINDOWS\TrueCrypt Setup.exe /u			[optional]
-		2.1a	C:\WINDOWS\TrueCrypt Setup.exe /u			[optional]
-		3.0		C:\WINDOWS\TrueCrypt Setup.exe /u			[optional]
-		3.0a	C:\WINDOWS\TrueCrypt Setup.exe /u			[optional]
+		1.0		C:\WINDOWS\VeraCrypt Setup.exe /u			[optional]
+		1.0a	C:\WINDOWS\VeraCrypt Setup.exe /u			[optional]
+		2.0		C:\WINDOWS\VeraCrypt Setup.exe /u			[optional]
+		2.1		C:\WINDOWS\VeraCrypt Setup.exe /u			[optional]
+		2.1a	C:\WINDOWS\VeraCrypt Setup.exe /u			[optional]
+		3.0		C:\WINDOWS\VeraCrypt Setup.exe /u			[optional]
+		3.0a	C:\WINDOWS\VeraCrypt Setup.exe /u			[optional]
 		3.1		The UninstallString was NEVER written (fortunately, 3.1a replaced 3.1 after 2 weeks)
-		3.1a	C:\WINDOWS\TrueCrypt Setup.exe /u
-		4.0		C:\WINDOWS\TrueCrypt Setup.exe /u C:\Program Files\TrueCrypt
-		4.1		C:\WINDOWS\TrueCrypt Setup.exe /u C:\Program Files\TrueCrypt
-		4.2		C:\WINDOWS\TrueCrypt Setup.exe /u C:\Program Files\TrueCrypt
-		4.2a	C:\WINDOWS\TrueCrypt Setup.exe /u C:\Program Files\TrueCrypt
-		4.3		"C:\Program Files\TrueCrypt\TrueCrypt Setup.exe" /u C:\Program Files\TrueCrypt\
-		4.3a	"C:\Program Files\TrueCrypt\TrueCrypt Setup.exe" /u C:\Program Files\TrueCrypt\
-		5.0+	"C:\Program Files\TrueCrypt\TrueCrypt Setup.exe" /u
+		3.1a	C:\WINDOWS\VeraCrypt Setup.exe /u
+		4.0		C:\WINDOWS\VeraCrypt Setup.exe /u C:\Program Files\VeraCrypt
+		4.1		C:\WINDOWS\VeraCrypt Setup.exe /u C:\Program Files\VeraCrypt
+		4.2		C:\WINDOWS\VeraCrypt Setup.exe /u C:\Program Files\VeraCrypt
+		4.2a	C:\WINDOWS\VeraCrypt Setup.exe /u C:\Program Files\VeraCrypt
+		4.3		"C:\Program Files\VeraCrypt\VeraCrypt Setup.exe" /u C:\Program Files\VeraCrypt\
+		4.3a	"C:\Program Files\VeraCrypt\VeraCrypt Setup.exe" /u C:\Program Files\VeraCrypt\
+		5.0+	"C:\Program Files\VeraCrypt\VeraCrypt Setup.exe" /u
 
 		Note: In versions 1.0-3.0a the user was able to choose whether to install the uninstaller.
 			  The default was to install it. If it wasn't installed, there was no UninstallString.
@@ -1818,7 +1818,7 @@ void SetInstallationPath (HWND hwndDlg)
 		{
 			size_t len = 0;
 
-			// Cut and paste the location (path) where TrueCrypt is installed to InstallationPath
+			// Cut and paste the location (path) where VeraCrypt is installed to InstallationPath
 			if (rv[0] == '"')
 			{
 				// 4.3 or later
@@ -1851,7 +1851,7 @@ void SetInstallationPath (HWND hwndDlg)
 				{
 					// 1.0-3.1a (except 3.1)
 
-					// We know that TrueCrypt is installed but don't know where. It's not safe to continue installing
+					// We know that VeraCrypt is installed but don't know where. It's not safe to continue installing
 					// over the old version.
 
 					Error ("UNINSTALL_OLD_VERSION_FIRST");
@@ -1875,11 +1875,11 @@ void SetInstallationPath (HWND hwndDlg)
 	{
 		char mp[MAX_PATH];
 
-		// Determine whether we were launched from the folder where TrueCrypt is installed
+		// Determine whether we were launched from the folder where VeraCrypt is installed
 		GetModuleFileName (NULL, mp, sizeof (mp));
 		if (strncmp (InstallationPath, mp, min (strlen(InstallationPath), strlen(mp))) == 0)
 		{
-			// We were launched from the folder where TrueCrypt is installed
+			// We were launched from the folder where VeraCrypt is installed
 
 			if (!IsNonInstallMode() && !bDevm)
 				bChangeMode = TRUE;
@@ -1906,7 +1906,7 @@ void SetInstallationPath (HWND hwndDlg)
 			}
 		}
 
-		strncat (path, "\\TrueCrypt\\", min (strlen("\\TrueCrypt\\"), sizeof(path)-strlen(path)-1));
+		strncat (path, "\\VeraCrypt\\", min (strlen("\\VeraCrypt\\"), sizeof(path)-strlen(path)-1));
 		strncpy (InstallationPath, path, sizeof(InstallationPath)-1);
 	}
 
@@ -2020,7 +2020,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, char *lpszComm
 
 	SelfExtractStartupInit();
 
-	lpszTitle = L"TrueCrypt Setup";
+	lpszTitle = L"VeraCrypt Setup";
 
 	InitCommonControls ();
 
@@ -2094,13 +2094,13 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, char *lpszComm
 			}
 			else if (!bDevm)
 			{
-				MessageBox (NULL, "Error: This installer file does not contain any compressed files.\n\nTo create a self-extracting installation package (with embedded compressed files), run:\n\"TrueCrypt Setup.exe\" /p", "TrueCrypt", MB_ICONERROR | MB_SETFOREGROUND | MB_TOPMOST);
+				MessageBox (NULL, "Error: This installer file does not contain any compressed files.\n\nTo create a self-extracting installation package (with embedded compressed files), run:\n\"VeraCrypt Setup.exe\" /p", "VeraCrypt", MB_ICONERROR | MB_SETFOREGROUND | MB_TOPMOST);
 				exit (1);
 			}
 
 			if (bChangeMode)
 			{
-				/* TrueCrypt is already installed on this system and we were launched from the Program Files folder */
+				/* VeraCrypt is already installed on this system and we were launched from the Program Files folder */
 
 				char *tmpStr[] = {0, "SELECT_AN_ACTION", "REPAIR_REINSTALL", "UNINSTALL", "EXIT", 0};
 
diff --git a/src/Setup/Setup.h b/src/Setup/Setup.h
index fc1feb55..c391d5d1 100644
--- a/src/Setup/Setup.h
+++ b/src/Setup/Setup.h
@@ -19,28 +19,28 @@ extern "C" {
 // Specifies what files to install, where (determined by the prefix), and in what order
 static char *szFiles[]=
 {
-	"ATrueCrypt User Guide.pdf",
+	"AVeraCrypt User Guide.pdf",
 	"ALicense.txt",
-	"ATrueCrypt.exe",
-	"ATrueCrypt Format.exe",
-	"Atruecrypt.sys",
-	"Atruecrypt-x64.sys",
-	"Dtruecrypt.sys",
-	"ATrueCrypt Setup.exe"
+	"AVeraCrypt.exe",
+	"AVeraCrypt Format.exe",
+	"Averacrypt.sys",
+	"Averacrypt-x64.sys",
+	"Dveracrypt.sys",
+	"AVeraCrypt Setup.exe"
 };
 
 // Specifies what files are included in self-extracting packages (no other files will be packaged or extracted).
 static char *szCompressedFiles[]=
 {
-	"TrueCrypt User Guide.pdf",
+	"VeraCrypt User Guide.pdf",
 	"License.txt",
-	"TrueCrypt.exe",
-	"TrueCrypt Format.exe",
-	"truecrypt.sys",
-	"truecrypt-x64.sys"
+	"VeraCrypt.exe",
+	"VeraCrypt Format.exe",
+	"veracrypt.sys",
+	"veracrypt-x64.sys"
 };
 
-#define FILENAME_64BIT_DRIVER	"truecrypt-x64.sys"
+#define FILENAME_64BIT_DRIVER	"veracrypt-x64.sys"
 #define NBR_COMPRESSED_FILES (sizeof(szCompressedFiles) / sizeof(szCompressedFiles[0]))
 
 void localcleanup (void);
diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc
index c53be64f..7e39d711 100644
--- a/src/Setup/Setup.rc
+++ b/src/Setup/Setup.rc
@@ -44,13 +44,13 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "TrueCrypt Foundation"
-            VALUE "FileDescription", "TrueCrypt Setup"
-            VALUE "FileVersion", "7.1a"
-            VALUE "LegalTrademarks", "TrueCrypt"
-            VALUE "OriginalFilename", "TrueCrypt Setup.exe"
-            VALUE "ProductName", "TrueCrypt"
-            VALUE "ProductVersion", "7.1a"
+            VALUE "CompanyName", "IDRIX"
+            VALUE "FileDescription", "VeraCrypt Setup"
+            VALUE "FileVersion", "1.0a"
+            VALUE "LegalTrademarks", "VeraCrypt"
+            VALUE "OriginalFilename", "VeraCrypt Setup.exe"
+            VALUE "ProductName", "VeraCrypt"
+            VALUE "ProductVersion", "1.0a"
         END
     END
     BLOCK "VarFileInfo"
@@ -81,11 +81,11 @@ IDR_COMREG              REGISTRY                "ComSetup.rgs"
 
 IDD_UNINSTALL DIALOGEX 0, 0, 349, 234
 STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Uninstall TrueCrypt"
+CAPTION "Uninstall VeraCrypt"
 CLASS "CustomDlg"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT           "Click Uninstall to remove TrueCrypt from this system.",IDT_UNINSTALL_DIR,8,8,334,8
+    LTEXT           "Click Uninstall to remove VeraCrypt from this system.",IDT_UNINSTALL_DIR,8,8,334,8
     LISTBOX         IDC_LOG_WINDOW,7,21,335,179,LBS_NOINTEGRALHEIGHT | LBS_NOSEL | WS_VSCROLL
     DEFPUSHBUTTON   "&Uninstall",IDC_UNINSTALL,236,213,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,292,213,50,14
@@ -101,12 +101,12 @@ BEGIN
     EDITTEXT        IDC_DESTINATION,11,41,260,13,ES_AUTOHSCROLL
     PUSHBUTTON      "Bro&wse...",IDC_BROWSE,278,40,59,14
     CONTROL         "Install &for all users",IDC_ALL_USERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,77,168,11
-    CONTROL         "Associate the .tc file &extension with TrueCrypt",IDC_FILE_TYPE,
+    CONTROL         "Associate the .hc file &extension with VeraCrypt",IDC_FILE_TYPE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,113,232,11
-    CONTROL         "Add TrueCrypt to &Start menu",IDC_PROG_GROUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,89,168,11
+    CONTROL         "Add VeraCrypt to &Start menu",IDC_PROG_GROUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,89,168,11
     CONTROL         "Create System &Restore point",IDC_SYSTEM_RESTORE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,125,194,11
-    CONTROL         "Add TrueCrypt icon to &desktop",IDC_DESKTOP_ICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,101,168,11
-    LTEXT           "Please select or type the location where you want to install the TrueCrypt program files. If the specified folder does not exist, it will be automatically created.",IDT_INSTALL_DESTINATION,11,14,319,25
+    CONTROL         "Add VeraCrypt icon to &desktop",IDC_DESKTOP_ICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,101,168,11
+    LTEXT           "Please select or type the location where you want to install the VeraCrypt program files. If the specified folder does not exist, it will be automatically created.",IDT_INSTALL_DESTINATION,11,14,319,25
 END
 
 IDD_INFO_PAGE_DLG DIALOGEX 0, 0, 217, 156
@@ -127,7 +127,7 @@ END
 
 IDD_INSTL_DLG DIALOGEX 0, 0, 374, 231
 STYLE DS_SETFONT | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "TrueCrypt Setup Wizard"
+CAPTION "VeraCrypt Setup Wizard"
 CLASS "CustomDlg"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
@@ -141,7 +141,7 @@ BEGIN
     CONTROL         "",IDC_SETUP_WIZARD_GFX_AREA,"Static",SS_GRAYRECT | NOT WS_VISIBLE,0,0,378,36,WS_EX_TRANSPARENT | WS_EX_STATICEDGE
     CONTROL         "",IDC_HR_BOTTOM,"Static",SS_ETCHEDHORZ,67,204,306,1,WS_EX_STATICEDGE
     CONTROL         "",IDC_HR,"Static",SS_ETCHEDHORZ,0,35,399,1,WS_EX_STATICEDGE
-    LTEXT           "TrueCrypt Installer",IDC_STATIC,4,200,62,8,WS_DISABLED
+    LTEXT           "VeraCrypt Installer",IDC_STATIC,4,200,62,8,WS_DISABLED
     LTEXT           "",IDC_BOX_INFO,18,18,317,13,0,WS_EX_TRANSPARENT
     LTEXT           "",IDC_MAIN_CONTENT_CANVAS,0,36,374,164
     LTEXT           "",IDC_POS_BOX,14,42,346,155,0,WS_EX_TRANSPARENT
@@ -308,8 +308,8 @@ END
 // Bitmap
 //
 
-IDB_SETUP_WIZARD        BITMAP                  "TrueCrypt_setup.bmp"
-IDB_SETUP_WIZARD_BKG    BITMAP                  "TrueCrypt_setup_background.bmp"
+IDB_SETUP_WIZARD        BITMAP                  "VeraCrypt_setup.bmp"
+IDB_SETUP_WIZARD_BKG    BITMAP                  "VeraCrypt_setup_background.bmp"
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Setup/Setup.vcproj b/src/Setup/Setup.vcproj
index bb1d6f57..cd27eac2 100644
--- a/src/Setup/Setup.vcproj
+++ b/src/Setup/Setup.vcproj
@@ -66,7 +66,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
 				AdditionalDependencies="libcmtd.lib comctl32.lib setupapi.lib"
-				OutputFile="$(OutDir)/TrueCryptSetup.exe"
+				OutputFile="$(OutDir)/VeraCryptSetup.exe"
 				LinkIncremental="2"
 				GenerateManifest="false"
 				UACExecutionLevel="2"
@@ -99,7 +99,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="md &quot;..\Debug\Setup Files&quot; 2&gt;NUL:&#x0D;&#x0A;copy Debug\TrueCryptSetup.exe &quot;..\Debug\Setup Files\TrueCrypt Setup.exe&quot; &gt;NUL:&#x0D;&#x0A;"
+				CommandLine="md &quot;..\Debug\Setup Files&quot; 2&gt;NUL:&#x0D;&#x0A;copy Debug\VeraCryptSetup.exe &quot;..\Debug\Setup Files\VeraCrypt Setup.exe&quot; &gt;NUL:&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -153,7 +153,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/IGNORE:4089"
 				AdditionalDependencies="comctl32.lib setupapi.lib"
-				OutputFile="$(OutDir)/TrueCryptSetup.exe"
+				OutputFile="$(OutDir)/VeraCryptSetup.exe"
 				LinkIncremental="1"
 				GenerateManifest="false"
 				UACExecutionLevel="2"
@@ -187,7 +187,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy Release\TrueCryptSetup.exe &quot;..\Release\Setup Files\TrueCrypt Setup.exe&quot;"
+				CommandLine="copy Release\VeraCryptSetup.exe &quot;..\Release\Setup Files\VeraCrypt Setup.exe&quot;"
 			/>
 		</Configuration>
 	</Configurations>
@@ -416,19 +416,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Common\TrueCrypt.ico"
+				RelativePath="..\Common\VeraCrypt.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\TrueCrypt_setup.bmp"
+				RelativePath=".\VeraCrypt_setup.bmp"
 				>
 			</File>
 			<File
-				RelativePath=".\TrueCrypt_setup_background.bmp"
+				RelativePath=".\VeraCrypt_setup_background.bmp"
 				>
 			</File>
 			<File
-				RelativePath="..\Common\TrueCrypt_Volume.ico"
+				RelativePath="..\Common\VeraCrypt_Volume.ico"
 				>
 			</File>
 			<Filter
diff --git a/src/Setup/Wizard.c b/src/Setup/Wizard.c
index 3e9de719..896ce644 100644
--- a/src/Setup/Wizard.c
+++ b/src/Setup/Wizard.c
@@ -239,7 +239,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 				SetCheckBox (hwndDlg, IDC_AGREE, bLicenseAccepted);
 
 				SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_BOX_TITLE), L"Please read the license terms");
-				SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_BOX_INFO), L"You must accept these license terms before you can use, extract, or install TrueCrypt.");
+				SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_BOX_INFO), L"You must accept these license terms before you can use, extract, or install VeraCrypt.");
 				SetWindowTextW (GetDlgItem (hwndDlg, IDC_BOX_HELP), L"IMPORTANT: By checking the checkbox below, you accept these license terms and signify that you understand and agree to them. Please click the 'arrow down' icon to see the rest of the license.");	// Cannot be localized by third parties (for legal reasons).
 				//SendMessage (GetDlgItem (hwndDlg, IDC_BOX_HELP), WM_SETFONT, (WPARAM) hUserBoldFont, (LPARAM) TRUE);
 
@@ -308,7 +308,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 			if (strlen(WizardDestExtractPath) < 2)
 			{ 
 				strcpy (WizardDestExtractPath, SetupFilesDir);
-				strncat (WizardDestExtractPath, "TrueCrypt\\", sizeof (WizardDestExtractPath) - strlen (WizardDestExtractPath) - 1);
+				strncat (WizardDestExtractPath, "VeraCrypt\\", sizeof (WizardDestExtractPath) - strlen (WizardDestExtractPath) - 1);
 			}
 
 			SendMessage (GetDlgItem (hwndDlg, IDC_DESTINATION), EM_LIMITTEXT, TC_MAX_PATH - 1, 0);
@@ -838,7 +838,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 
 			SendMessage (GetDlgItem (hwndDlg, IDC_BOX_TITLE), WM_SETFONT, (WPARAM) hUserBoldFont, (LPARAM) TRUE);
 
-			SetWindowText (hwndDlg, "TrueCrypt Setup " VERSION_STRING);
+			SetWindowText (hwndDlg, "VeraCrypt Setup " VERSION_STRING);
 
 			DonColorSchemeId = GetDonVal (2, 9);
 
@@ -903,14 +903,14 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 
 				if (nCurrentOS == WIN_2000)
 				{
-					WarningDirect (L"Warning: Please note that this may be the last version of TrueCrypt that supports Windows 2000. If you want to be able to upgrade to future versions of TrueCrypt (which is highly recommended), you will need to upgrade to Windows XP or a later version of Windows.\n\nNote: Microsoft stopped issuing security updates for Windows 2000 to the general public on 7/13/2010 (the last non-security update for Windows 2000 was issued to the general public in 2005).");
+					WarningDirect (L"Warning: Please note that this may be the last version of VeraCrypt that supports Windows 2000. If you want to be able to upgrade to future versions of VeraCrypt (which is highly recommended), you will need to upgrade to Windows XP or a later version of Windows.\n\nNote: Microsoft stopped issuing security updates for Windows 2000 to the general public on 7/13/2010 (the last non-security update for Windows 2000 was issued to the general public in 2005).");
 
 
 					HKEY hkey;
 
 					if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Updates\\Windows 2000\\SP5\\Update Rollup 1", 0, KEY_READ, &hkey) != ERROR_SUCCESS)
 					{
-						ErrorDirect (L"TrueCrypt requires Update Rollup 1 for Windows 2000 SP4 to be installed.\n\nFor more information, see http://support.microsoft.com/kb/891861");
+						ErrorDirect (L"VeraCrypt requires Update Rollup 1 for Windows 2000 SP4 to be installed.\n\nFor more information, see http://support.microsoft.com/kb/891861");
 						AbortProcessSilent ();
 					}