diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 89708db602..cf1b05dd8e 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -2243,6 +2243,10 @@
 				RelativePath=".\..\src\table\station_land.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\strgen_tables.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\..\objs\langs\table\strings.h"
 				>
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index bd17b422de..41efc03dc5 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -2240,6 +2240,10 @@
 				RelativePath=".\..\src\table\station_land.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\strgen_tables.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\..\objs\langs\table\strings.h"
 				>
diff --git a/source.list b/source.list
index 452a2c3e8c..cbd654e3f1 100644
--- a/source.list
+++ b/source.list
@@ -511,6 +511,7 @@ table/roadveh_movement.h
 table/settings.h
 table/sprites.h
 table/station_land.h
+table/strgen_tables.h
 ../objs/langs/table/strings.h
 table/town_land.h
 table/track_land.h
diff --git a/src/strgen/strgen.cpp b/src/strgen/strgen.cpp
index 4da6a078ff..316b98ce07 100644
--- a/src/strgen/strgen.cpp
+++ b/src/strgen/strgen.cpp
@@ -32,7 +32,7 @@
 #define stderr stdout
 #endif /* __MORPHOS__ */
 
-#include "../table/strgen.h"
+#include "../table/strgen_tables.h"
 
 /* Compiles a list of strings into a compiled string list */
 
@@ -1217,9 +1217,9 @@ int CDECL main(int argc, char *argv[])
 						} else if (cs->proc == EmitSetXY) {
 							flags = '2'; // Command needs two parameters
 						} else if (cs->proc == EmitGender) {
-							flags = 'g'; // Command needs number of parameters defined by plural value
+							flags = 'g'; // Command needs number of parameters defined by number of genders
 						} else if (cs->proc == EmitPlural) {
-							flags = 'p'; // Command needs number of parameters defined by number of cases
+							flags = 'p'; // Command needs number of parameters defined by plural value
 						} else {
 							flags = '0'; // Command needs no parameters
 						}
diff --git a/src/table/strgen.h b/src/table/strgen_tables.h
similarity index 99%
rename from src/table/strgen.h
rename to src/table/strgen_tables.h
index da48e53413..99b412f98b 100644
--- a/src/table/strgen.h
+++ b/src/table/strgen_tables.h
@@ -1,6 +1,6 @@
 /* $Id$ */
 
-/** @file table/strgen.h Tables of commands for strgen */
+/** @file table/strgen_tables.h Tables of commands for strgen */
 
 #include "../core/enum_type.hpp"