diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 4acb0236ba..af0c8d0573 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -611,10 +611,6 @@
RelativePath=".\..\src\music.cpp"
>
-
-
@@ -739,6 +735,10 @@
RelativePath=".\..\src\tile_map.cpp"
>
+
+
@@ -1119,10 +1119,6 @@
RelativePath=".\..\src\music.h"
>
-
-
@@ -1527,6 +1523,10 @@
RelativePath=".\..\src\town.h"
>
+
+
@@ -2239,10 +2239,6 @@
RelativePath=".\..\src\table\landscape_sprite.h"
>
-
-
@@ -2287,6 +2283,10 @@
RelativePath=".\..\src\..\objs\langs\table\strings.h"
>
+
+
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 93c592a75b..6003f3fce4 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -608,10 +608,6 @@
RelativePath=".\..\src\music.cpp"
>
-
-
@@ -736,6 +732,10 @@
RelativePath=".\..\src\tile_map.cpp"
>
+
+
@@ -1116,10 +1116,6 @@
RelativePath=".\..\src\music.h"
>
-
-
@@ -1524,6 +1520,10 @@
RelativePath=".\..\src\town.h"
>
+
+
@@ -2236,10 +2236,6 @@
RelativePath=".\..\src\table\landscape_sprite.h"
>
-
-
@@ -2284,6 +2280,10 @@
RelativePath=".\..\src\..\objs\langs\table\strings.h"
>
+
+
diff --git a/source.list b/source.list
index c1ca1b352f..0fb15096e4 100644
--- a/source.list
+++ b/source.list
@@ -38,7 +38,6 @@ map.cpp
misc.cpp
mixer.cpp
music.cpp
-namegen.cpp
network/network.cpp
network/network_client.cpp
network/network_command.cpp
@@ -72,6 +71,7 @@ subsidy.cpp
texteff.cpp
tgp.cpp
tile_map.cpp
+townname.cpp
#if WIN32
#else
#if WINCE
@@ -185,7 +185,6 @@ map_func.h
map_type.h
mixer.h
music.h
-namegen_func.h
network/network.h
network/network_base.h
network/network_client.h
@@ -287,6 +286,7 @@ tilehighlight_type.h
timetable.h
toolbar_gui.h
town.h
+townname_func.h
town_type.h
track_func.h
track_type.h
@@ -485,7 +485,6 @@ table/engines.h
table/genland.h
table/industry_land.h
table/landscape_sprite.h
-table/namegen.h
table/palette_convert.h
table/palettes.h
table/pricebase.h
@@ -497,6 +496,7 @@ table/sprites.h
table/station_land.h
table/strgen_tables.h
../objs/langs/table/strings.h
+table/townname.h
table/town_land.h
table/track_land.h
table/train_cmd.h
diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp
index ee9216cdc2..9b5303c0ef 100644
--- a/src/saveload/oldloader_sl.cpp
+++ b/src/saveload/oldloader_sl.cpp
@@ -35,7 +35,7 @@
#include "table/strings.h"
#include "../table/engines.h"
-#include "../table/namegen.h"
+#include "../table/townname.h"
static bool _read_ttdpatch_flags;
diff --git a/src/strings.cpp b/src/strings.cpp
index 29fbfb41b7..4376194808 100644
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -13,7 +13,7 @@
#include "openttd.h"
#include "currency.h"
#include "spritecache.h"
-#include "namegen_func.h"
+#include "townname_func.h"
#include "station_base.h"
#include "town.h"
#include "screenshot.h"
diff --git a/src/table/namegen.h b/src/table/townname.h
similarity index 99%
rename from src/table/namegen.h
rename to src/table/townname.h
index 47c9ff05f1..389530081b 100644
--- a/src/table/namegen.h
+++ b/src/table/townname.h
@@ -7,7 +7,7 @@
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see .
*/
-/** @file table/namegen.h Namepart tables for the town name generator */
+/** @file table/townname.h Namepart tables for the town name generator */
#include "../core/enum_type.hpp"
diff --git a/src/namegen.cpp b/src/townname.cpp
similarity index 99%
rename from src/namegen.cpp
rename to src/townname.cpp
index 211e21d9bd..ec63267b8b 100644
--- a/src/namegen.cpp
+++ b/src/townname.cpp
@@ -7,14 +7,14 @@
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see .
*/
-/** @file namegen.cpp Town name generators. */
+/** @file townname.cpp Town name generators. */
#include "stdafx.h"
-#include "namegen_func.h"
+#include "townname_func.h"
#include "string_func.h"
#include "core/alloc_func.hpp"
-#include "table/namegen.h"
+#include "table/townname.h"
/**
diff --git a/src/namegen_func.h b/src/townname_func.h
similarity index 93%
rename from src/namegen_func.h
rename to src/townname_func.h
index 7ce83fc416..d0e2da77c9 100644
--- a/src/namegen_func.h
+++ b/src/townname_func.h
@@ -7,7 +7,7 @@
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see .
*/
-/** @file namegen_func.h Town name generator stuff. */
+/** @file townname_func.h Town name generator stuff. */
#ifndef NAMEGEN_FUNC_H
#define NAMEGEN_FUNC_H