11 files changed, 45 insertions, 45 deletions
diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj
index 4e95c929..be1d7a99 100644
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -98,11 +98,11 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\xchat.props" />
+    <Import Project="..\..\win32\hexchat.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\xchat.props" />
+    <Import Project="..\..\win32\hexchat.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/src/dirent/dirent.vcxproj b/src/dirent/dirent.vcxproj
index 5ae75f57..7c41b01e 100644
--- a/src/dirent/dirent.vcxproj
+++ b/src/dirent/dirent.vcxproj
@@ -41,11 +41,11 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\xchat.props" />
+    <Import Project="..\..\win32\hexchat.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\xchat.props" />
+    <Import Project="..\..\win32\hexchat.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/src/fe-gtk/fe-gtk.vcxproj b/src/fe-gtk/fe-gtk.vcxproj
index cb102012..b38e132a 100644
--- a/src/fe-gtk/fe-gtk.vcxproj
+++ b/src/fe-gtk/fe-gtk.vcxproj
@@ -35,22 +35,22 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\xchat.props" />
+    <Import Project="..\..\win32\hexchat.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\xchat.props" />
+    <Import Project="..\..\win32\hexchat.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>xchat</TargetName>
+    <TargetName>hexchat</TargetName>
     <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
     <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>xchat</TargetName>
+    <TargetName>hexchat</TargetName>
     <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
     <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
   </PropertyGroup>
@@ -163,13 +163,13 @@
     <ClCompile Include="xtext.c" />
   </ItemGroup>
   <ItemGroup>
-    <Manifest Include="xchat.exe.manifest" />
+    <Manifest Include="hexchat.exe.manifest" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="xchat.rc" />
+    <ResourceCompile Include="hexchat.rc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\xchat.ico" />
+    <None Include="..\..\hexchat.ico" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/src/fe-gtk/fe-gtk.vcxproj.filters b/src/fe-gtk/fe-gtk.vcxproj.filters
index 0e2e830b..8a232dae 100644
--- a/src/fe-gtk/fe-gtk.vcxproj.filters
+++ b/src/fe-gtk/fe-gtk.vcxproj.filters
@@ -199,17 +199,17 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <Manifest Include="xchat.exe.manifest">
+    <Manifest Include="hexchat.exe.manifest">
       <Filter>Resource Files</Filter>
     </Manifest>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="xchat.rc">
+    <ResourceCompile Include="hexchat.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\xchat.ico">
+    <None Include="..\..\hexchat.ico">
       <Filter>Resource Files</Filter>
     </None>
   </ItemGroup>
diff --git a/src/fe-gtk/xchat.exe.manifest b/src/fe-gtk/hexchat.exe.manifest
index 13685d98..13685d98 100644
--- a/src/fe-gtk/xchat.exe.manifest
+++ b/src/fe-gtk/hexchat.exe.manifest
diff --git a/src/fe-gtk/xchat.rc b/src/fe-gtk/hexchat.rc
index f63b70e7..62000013 100644
--- a/src/fe-gtk/xchat.rc
+++ b/src/fe-gtk/hexchat.rc
@@ -2,7 +2,7 @@
 #include "../../config.h"
 #include "../../resource.h"
 
-XC_ICON ICON "../../xchat.ico" 
+XC_ICON ICON "../../hexchat.ico"
 
 VS_VERSION_INFO VERSIONINFO
 	FILEVERSION    COMMA_VERSION
@@ -13,8 +13,8 @@ VS_VERSION_INFO VERSIONINFO
 			BLOCK "040904B0"
 			BEGIN
 				
-				VALUE "FileDescription", "XChat-WDK IRC Client"
-				VALUE "ProductName", "XChat-WDK" 
+				VALUE "FileDescription", "HexChat IRC Client"
+				VALUE "ProductName", "HexChat"
 				VALUE "ProductVersion", PACKAGE_VERSION
 				VALUE "FileVersion", PACKAGE_VERSION
 			END
diff --git a/src/fe-text/fe-text.vcxproj b/src/fe-text/fe-text.vcxproj
index e8ed04b0..dd37f162 100644
--- a/src/fe-text/fe-text.vcxproj
+++ b/src/fe-text/fe-text.vcxproj
@@ -35,22 +35,22 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\xchat.props" />
+    <Import Project="..\..\win32\hexchat.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\xchat.props" />
+    <Import Project="..\..\win32\hexchat.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>xchat-text</TargetName>
+    <TargetName>hexchat-text</TargetName>
     <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
     <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>xchat-text</TargetName>
+    <TargetName>hexchat-text</TargetName>
     <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
     <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
   </PropertyGroup>
diff --git a/src/pixmaps/pixmaps.vcxproj b/src/pixmaps/pixmaps.vcxproj
index ec33a49b..a274adeb 100644
--- a/src/pixmaps/pixmaps.vcxproj
+++ b/src/pixmaps/pixmaps.vcxproj
@@ -35,11 +35,11 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\xchat.props" />
+    <Import Project="..\..\win32\hexchat.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\xchat.props" />
+    <Import Project="..\..\win32\hexchat.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -93,7 +93,7 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="..\..\xchat.png" />
+    <None Include="..\..\hexchat.png" />
     <None Include="book.png" />
     <None Include="fileoffer.png" />
     <None Include="highlight.png" />
diff --git a/src/pixmaps/pixmaps.vcxproj.filters b/src/pixmaps/pixmaps.vcxproj.filters
index aca4cd4b..5944362a 100644
--- a/src/pixmaps/pixmaps.vcxproj.filters
+++ b/src/pixmaps/pixmaps.vcxproj.filters
@@ -34,7 +34,7 @@
     <None Include="voice.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\..\xchat.png">
+    <None Include="..\..\hexchat.png">
       <Filter>Resource Files</Filter>
     </None>
   </ItemGroup>
diff --git a/src/version/version.c b/src/version/version.c
index 53af5675..40b1bc8f 100644
--- a/src/version/version.c
+++ b/src/version/version.c
@@ -72,32 +72,32 @@ main (int argc, char *argv[])
 {
 	if (argc > 1)
 	{
-		if (!strcmp (argv[1], "-r"))			/* xchat.rc/FILEVERSION, PRODUCTVERSION */
+		if (!strcmp (argv[1], "-r"))			/* hexchat.rc/FILEVERSION, PRODUCTVERSION */
 		{
 			printf ("#define COMMA_VERSION %s\n", comma ());
 		}
-		else if (!strcmp (argv[1], "-a"))	/* xchat-wdk.iss/AppVerName */
+		else if (!strcmp (argv[1], "-a"))	/* hexchat.iss/AppVerName */
 		{
 #ifdef _WIN64
-			printf ("AppVerName=XChat-WDK %s (x64)\n", PACKAGE_VERSION);
+			printf ("AppVerName=HexChat %s (x64)\n", PACKAGE_VERSION);
 #else
-			printf ("AppVerName=XChat-WDK %s (x86)\n", PACKAGE_VERSION);
+			printf ("AppVerName=HexChat %s (x86)\n", PACKAGE_VERSION);
 #endif
 		}
-		else if (!strcmp (argv[1], "-v"))	/* xchat-wdk.iss/AppVersion */
+		else if (!strcmp (argv[1], "-v"))	/* hexchat.iss/AppVersion */
 		{
 			printf ("AppVersion=%s\n", point ());
 		}
-		else if (!strcmp (argv[1], "-i"))	/* xchat-wdk.iss/VersionInfoVersion */
+		else if (!strcmp (argv[1], "-i"))	/* hexchat.iss/VersionInfoVersion */
 		{
 			printf ("VersionInfoVersion=%s\n", point ());
 		}
-		else if (!strcmp (argv[1], "-o"))	/* xchat-wdk.iss/OutputBaseFilename */
+		else if (!strcmp (argv[1], "-o"))	/* hexchat.iss/OutputBaseFilename */
 		{
 #ifdef _WIN64
-			printf ("OutputBaseFilename=XChat-WDK %s x64\n", PACKAGE_VERSION);
+			printf ("OutputBaseFilename=HexChat %s x64\n", PACKAGE_VERSION);
 #else
-			printf ("OutputBaseFilename=XChat-WDK %s x86\n", PACKAGE_VERSION);
+			printf ("OutputBaseFilename=HexChat %s x86\n", PACKAGE_VERSION);
 #endif
 		}
 		else if (!strcmp (argv[1], "-v"))	/* version.txt */
@@ -105,30 +105,30 @@ main (int argc, char *argv[])
 			printf ("%s", PACKAGE_VERSION);
 		} else
 		{
-			printf ("usage:\n\t-a\txchat-wdk.iss/AppVerName\n\t-i\txchat-wdk.iss/VersionInfoVersion\n\t-o\txchat-wdk.iss/OutputBaseFilename\n\t-r\txchat.rc/FILEVERSION, PRODUCTVERSION\n\t-v\txchat-wdk.iss/AppVersion\n");
+			printf ("usage:\n\t-a\thexchat.iss/AppVerName\n\t-i\thexchat.iss/VersionInfoVersion\n\t-o\thexchat.iss/OutputBaseFilename\n\t-r\thexchat.rc/FILEVERSION, PRODUCTVERSION\n\t-v\thexchat.iss/AppVersion\n");
 		}
 	} else
 	{
-		printf ("usage:\n\t-a\txchat-wdk.iss/AppVerName\n\t-i\txchat-wdk.iss/VersionInfoVersion\n\t-o\txchat-wdk.iss/OutputBaseFilename\n\t-r\txchat.rc/FILEVERSION, PRODUCTVERSION\n\t-v\txchat-wdk.iss/AppVersion\n");
+		printf ("usage:\n\t-a\thexchat.iss/AppVerName\n\t-i\thexchat.iss/VersionInfoVersion\n\t-o\thexchat.iss/OutputBaseFilename\n\t-r\thexchat.rc/FILEVERSION, PRODUCTVERSION\n\t-v\thexchat.iss/AppVersion\n");
 	}
 
 #if 0 /* ugly hack */
 	switch ((int) argv[1][0])
 	{
-		case 'r':	/* xchat.rc/FILEVERSION, PRODUCTVERSION*/
+		case 'r':	/* hexchat.rc/FILEVERSION, PRODUCTVERSION*/
 			printf ("#define COMMA_VERSION \"%s\"\n", comma ());
 			break;
-		case 'a':	/* xchat-wdk.iss/AppVerName */
-			printf ("AppVerName=XChat-WDK %s\n", PACKAGE_VERSION);
+		case 'a':	/* hexchat.iss/AppVerName */
+			printf ("AppVerName=HexChat %s\n", PACKAGE_VERSION);
 			break;
-		case 'v':	/* xchat-wdk.iss/AppVersion */
+		case 'v':	/* hexchat.iss/AppVersion */
 			printf ("AppVersion=%s\n", point ());
 			break;
-		case 'i':	/* xchat-wdk.iss/VersionInfoVersion */
+		case 'i':	/* hexchat.iss/VersionInfoVersion */
 			printf ("VersionInfoVersion=%s\n", point ());
 			break;
-		case 'o':	/* xchat-wdk.iss/OutputBaseFilename */
-			printf ("OutputBaseFilename=XChat-WDK %s\n", PACKAGE_VERSION);
+		case 'o':	/* hexchat.iss/OutputBaseFilename */
+			printf ("OutputBaseFilename=HexChat %s\n", PACKAGE_VERSION);
 			break;
 		case 'u':	/* version.txt */
 			printf ("%s", PACKAGE_VERSION);
diff --git a/src/version/version.vcxproj b/src/version/version.vcxproj
index 5a4fe5cc..49b4250f 100644
--- a/src/version/version.vcxproj
+++ b/src/version/version.vcxproj
@@ -35,11 +35,11 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\xchat.props" />
+    <Import Project="..\..\win32\hexchat.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\xchat.props" />
+    <Import Project="..\..\win32\hexchat.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">