diff --git a/projects/VC7.1/fgfs-launch-clients/.gitignore b/projects/VC7.1/fgfs-tools-clients/.gitignore
similarity index 100%
rename from projects/VC7.1/fgfs-launch-clients/.gitignore
rename to projects/VC7.1/fgfs-tools-clients/.gitignore
diff --git a/projects/VC7.1/fgfs-launch-clients/fgfs-launch-clients.vcproj b/projects/VC7.1/fgfs-tools-clients/fgfs-tools-clients.vcproj
similarity index 95%
rename from projects/VC7.1/fgfs-launch-clients/fgfs-launch-clients.vcproj
rename to projects/VC7.1/fgfs-tools-clients/fgfs-tools-clients.vcproj
index 415e9722..318ec562 100644
--- a/projects/VC7.1/fgfs-launch-clients/fgfs-launch-clients.vcproj
+++ b/projects/VC7.1/fgfs-tools-clients/fgfs-tools-clients.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.10"
-	Name="fgfs-launch-clients"
+	Name="fgfs-tools-clients"
 	ProjectGUID="{4CCE2136-24FC-4F7A-A609-8018F00F9042}"
 	Keyword="Win32Proj">
 	<Platforms>
@@ -34,11 +34,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="ul_d.lib sg_d.lib zlibd.lib ws2_32.lib"
-				OutputFile="$(OutDir)/fgfs-launch-clients.exe"
+				OutputFile="$(OutDir)/fgfs-tools-clients.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\..\plib;..\..\..\..\3rdParty\lib"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/fgfs-launch-clients.pdb"
+				ProgramDatabaseFile="$(OutDir)/fgfs-tools-clients.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
@@ -83,7 +83,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="ul.lib sg.lib zlib.lib ws2_32.lib"
-				OutputFile="$(OutDir)/fgfs-launch-clients.exe"
+				OutputFile="$(OutDir)/fgfs-tools-clients.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\..\plib;..\..\..\..\3rdParty\lib"
 				GenerateDebugInformation="TRUE"
diff --git a/projects/VC7.1/fgfs-launch-server/.gitignore b/projects/VC7.1/fgfs-tools-server/.gitignore
similarity index 100%
rename from projects/VC7.1/fgfs-launch-server/.gitignore
rename to projects/VC7.1/fgfs-tools-server/.gitignore
diff --git a/projects/VC7.1/fgfs-launch-server/fgfs-launch-server.vcproj b/projects/VC7.1/fgfs-tools-server/fgfs-tools-server.vcproj
similarity index 95%
rename from projects/VC7.1/fgfs-launch-server/fgfs-launch-server.vcproj
rename to projects/VC7.1/fgfs-tools-server/fgfs-tools-server.vcproj
index 2ab15bf4..b6ce0d0f 100644
--- a/projects/VC7.1/fgfs-launch-server/fgfs-launch-server.vcproj
+++ b/projects/VC7.1/fgfs-tools-server/fgfs-tools-server.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.10"
-	Name="fgfs-launch-server"
+	Name="fgfs-tools-server"
 	ProjectGUID="{5086D5EB-5EC0-437F-8181-264315F21A17}"
 	Keyword="Win32Proj">
 	<Platforms>
@@ -34,11 +34,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="ul_d.lib sg_d.lib zlibd.lib ws2_32.lib"
-				OutputFile="$(OutDir)/fgfs-launch-server.exe"
+				OutputFile="$(OutDir)/fgfs-tools-server.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\..\plib;..\..\..\..\3rdParty\lib"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/fgfs-launch-server.pdb"
+				ProgramDatabaseFile="$(OutDir)/fgfs-tools-server.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
@@ -83,7 +83,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="ul.lib sg.lib zlib.lib ws2_32.lib"
-				OutputFile="$(OutDir)/fgfs-launch-server.exe"
+				OutputFile="$(OutDir)/fgfs-tools-server.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\..\plib;..\..\..\..\3rdParty\lib"
 				GenerateDebugInformation="TRUE"
diff --git a/projects/VC7.1/terragear.sln b/projects/VC7.1/terragear.sln
index db68b2c9..d5942f1f 100644
--- a/projects/VC7.1/terragear.sln
+++ b/projects/VC7.1/terragear.sln
@@ -198,16 +198,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fgfs-construct", "fgfs-cons
 		{78922FED-3B8B-4276-ADFF-9A19330F7CFE} = {78922FED-3B8B-4276-ADFF-9A19330F7CFE}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fgfs-launch-server", "fgfs-launch-server\fgfs-launch-server.vcproj", "{5086D5EB-5EC0-437F-8181-264315F21A17}"
-	ProjectSection(ProjectDependencies) = postProject
-		{22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fgfs-launch-clients", "fgfs-launch-clients\fgfs-launch-clients.vcproj", "{4CCE2136-24FC-4F7A-A609-8018F00F9042}"
-	ProjectSection(ProjectDependencies) = postProject
-		{22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libTerra", "libTerra\libTerra.vcproj", "{F74722A5-4015-453B-BF4F-161A4766DDA1}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
@@ -227,6 +217,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogr-decode", "ogr-decode\og
 		{22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fgfs-tools-clients", "fgfs-tools-clients\fgfs-tools-clients.vcproj", "{4CCE2136-24FC-4F7A-A609-8018F00F9042}"
+	ProjectSection(ProjectDependencies) = postProject
+		{22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fgfs-tools-server", "fgfs-tools-server\fgfs-tools-server.vcproj", "{5086D5EB-5EC0-437F-8181-264315F21A17}"
+	ProjectSection(ProjectDependencies) = postProject
+		{22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -373,14 +373,6 @@ Global
 		{8AB3DC28-1CAC-4DC0-B8CD-EB066E3711F9}.Debug.Build.0 = Debug|Win32
 		{8AB3DC28-1CAC-4DC0-B8CD-EB066E3711F9}.Release.ActiveCfg = Release|Win32
 		{8AB3DC28-1CAC-4DC0-B8CD-EB066E3711F9}.Release.Build.0 = Release|Win32
-		{5086D5EB-5EC0-437F-8181-264315F21A17}.Debug.ActiveCfg = Debug|Win32
-		{5086D5EB-5EC0-437F-8181-264315F21A17}.Debug.Build.0 = Debug|Win32
-		{5086D5EB-5EC0-437F-8181-264315F21A17}.Release.ActiveCfg = Release|Win32
-		{5086D5EB-5EC0-437F-8181-264315F21A17}.Release.Build.0 = Release|Win32
-		{4CCE2136-24FC-4F7A-A609-8018F00F9042}.Debug.ActiveCfg = Debug|Win32
-		{4CCE2136-24FC-4F7A-A609-8018F00F9042}.Debug.Build.0 = Debug|Win32
-		{4CCE2136-24FC-4F7A-A609-8018F00F9042}.Release.ActiveCfg = Release|Win32
-		{4CCE2136-24FC-4F7A-A609-8018F00F9042}.Release.Build.0 = Release|Win32
 		{F74722A5-4015-453B-BF4F-161A4766DDA1}.Debug.ActiveCfg = Debug|Win32
 		{F74722A5-4015-453B-BF4F-161A4766DDA1}.Debug.Build.0 = Debug|Win32
 		{F74722A5-4015-453B-BF4F-161A4766DDA1}.Release.ActiveCfg = Release|Win32
@@ -393,6 +385,14 @@ Global
 		{376BFCF2-D8AF-48C1-ACFD-07E124DC6BB0}.Debug.Build.0 = Debug|Win32
 		{376BFCF2-D8AF-48C1-ACFD-07E124DC6BB0}.Release.ActiveCfg = Release|Win32
 		{376BFCF2-D8AF-48C1-ACFD-07E124DC6BB0}.Release.Build.0 = Release|Win32
+		{4CCE2136-24FC-4F7A-A609-8018F00F9042}.Debug.ActiveCfg = Debug|Win32
+		{4CCE2136-24FC-4F7A-A609-8018F00F9042}.Debug.Build.0 = Debug|Win32
+		{4CCE2136-24FC-4F7A-A609-8018F00F9042}.Release.ActiveCfg = Release|Win32
+		{4CCE2136-24FC-4F7A-A609-8018F00F9042}.Release.Build.0 = Release|Win32
+		{5086D5EB-5EC0-437F-8181-264315F21A17}.Debug.ActiveCfg = Debug|Win32
+		{5086D5EB-5EC0-437F-8181-264315F21A17}.Debug.Build.0 = Debug|Win32
+		{5086D5EB-5EC0-437F-8181-264315F21A17}.Release.ActiveCfg = Release|Win32
+		{5086D5EB-5EC0-437F-8181-264315F21A17}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection