diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 88044a818c..80c98483b8 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -667,10 +667,6 @@
 				RelativePath=".\..\src\pbs.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\players.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\queue.cpp"
 				>
@@ -875,6 +871,26 @@
 				RelativePath=".\..\src\command_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\company_base.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\company_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\company_gui.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\company_manager_face.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\company_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\console_func.h"
 				>
@@ -1279,26 +1295,6 @@
 				RelativePath=".\..\src\pbs.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\player_base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\player_face.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\player_func.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\player_gui.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\player_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\querystring_gui.h"
 				>
@@ -1743,6 +1739,10 @@
 				RelativePath=".\..\src\cheat_gui.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\company_gui.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\depot_gui.cpp"
 				>
@@ -1811,10 +1811,6 @@
 				RelativePath=".\..\src\osk_gui.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\player_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\rail_gui.cpp"
 				>
@@ -1907,6 +1903,10 @@
 				RelativePath=".\..\src\clear_cmd.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\company_cmd.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\disaster_cmd.cpp"
 				>
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 9c8b73d733..c8d2c0dc84 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -664,10 +664,6 @@
 				RelativePath=".\..\src\pbs.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\players.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\queue.cpp"
 				>
@@ -872,6 +868,26 @@
 				RelativePath=".\..\src\command_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\company_base.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\company_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\company_gui.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\company_manager_face.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\company_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\console_func.h"
 				>
@@ -1276,26 +1292,6 @@
 				RelativePath=".\..\src\pbs.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\player_base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\player_face.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\player_func.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\player_gui.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\player_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\querystring_gui.h"
 				>
@@ -1740,6 +1736,10 @@
 				RelativePath=".\..\src\cheat_gui.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\company_gui.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\depot_gui.cpp"
 				>
@@ -1808,10 +1808,6 @@
 				RelativePath=".\..\src\osk_gui.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\player_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\rail_gui.cpp"
 				>
@@ -1904,6 +1900,10 @@
 				RelativePath=".\..\src\clear_cmd.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\company_cmd.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\disaster_cmd.cpp"
 				>
diff --git a/source.list b/source.list
index 5b78893d72..a08822f296 100644
--- a/source.list
+++ b/source.list
@@ -60,7 +60,6 @@ os_timer.cpp
 #end
 pathfind.cpp
 pbs.cpp
-players.cpp
 queue.cpp
 rail.cpp
 rev.cpp
@@ -146,6 +145,11 @@ cheat_type.h
 cmd_helper.h
 command_func.h
 command_type.h
+company_base.h
+company_func.h
+company_gui.h
+company_manager_face.h
+company_type.h
 console_func.h
 console_gui.h
 console_internal.h
@@ -247,11 +251,6 @@ order_func.h
 order_type.h
 pathfind.h
 pbs.h
-player_base.h
-player_face.h
-player_func.h
-player_gui.h
-player_type.h
 querystring_gui.h
 queue.h
 rail.h
@@ -379,6 +378,7 @@ autoreplace_gui.cpp
 bridge_gui.cpp
 build_vehicle_gui.cpp
 cheat_gui.cpp
+company_gui.cpp
 depot_gui.cpp
 dock_gui.cpp
 engine_gui.cpp
@@ -396,7 +396,6 @@ newgrf_gui.cpp
 news_gui.cpp
 order_gui.cpp
 osk_gui.cpp
-player_gui.cpp
 rail_gui.cpp
 road_gui.cpp
 roadveh_gui.cpp
@@ -421,6 +420,7 @@ waypoint_gui.cpp
 aircraft_cmd.cpp
 autoreplace_cmd.cpp
 clear_cmd.cpp
+company_cmd.cpp
 disaster_cmd.cpp
 dummy_land.cpp
 group_cmd.cpp
diff --git a/src/ai/ai.cpp b/src/ai/ai.cpp
index d6e6168836..78189917ac 100644
--- a/src/ai/ai.cpp
+++ b/src/ai/ai.cpp
@@ -8,8 +8,8 @@
 #include "../command_func.h"
 #include "../network/network.h"
 #include "../core/alloc_func.hpp"
-#include "../player_func.h"
-#include "../player_base.h"
+#include "../company_func.h"
+#include "../company_base.h"
 #include "ai.h"
 #include "default/default.h"
 #include "trolly/trolly.h"
diff --git a/src/ai/default/default.cpp b/src/ai/default/default.cpp
index e269535ae3..defa32ab26 100644
--- a/src/ai/default/default.cpp
+++ b/src/ai/default/default.cpp
@@ -26,8 +26,8 @@
 #include "../../vehicle_func.h"
 #include "../../functions.h"
 #include "../../saveload.h"
-#include "../../player_func.h"
-#include "../../player_base.h"
+#include "../../company_func.h"
+#include "../../company_base.h"
 #include "../../settings_type.h"
 #include "default.h"
 #include "../../tunnelbridge.h"
diff --git a/src/ai/trolly/build.cpp b/src/ai/trolly/build.cpp
index 311ca71f27..f6aee32397 100644
--- a/src/ai/trolly/build.cpp
+++ b/src/ai/trolly/build.cpp
@@ -14,8 +14,8 @@
 #include "../../bridge.h"
 #include "../../vehicle_func.h"
 #include "../../vehicle_base.h"
-#include "../../player_base.h"
-#include "../../player_func.h"
+#include "../../company_base.h"
+#include "../../company_func.h"
 #include "../ai.h"
 #include "../../tunnelbridge.h"
 
diff --git a/src/ai/trolly/pathfinder.cpp b/src/ai/trolly/pathfinder.cpp
index 258243f23f..ca8b2a635c 100644
--- a/src/ai/trolly/pathfinder.cpp
+++ b/src/ai/trolly/pathfinder.cpp
@@ -13,8 +13,8 @@
 #include "../../tunnelbridge_map.h"
 #include "../ai.h"
 #include "../../variables.h"
-#include "../../player_base.h"
-#include "../../player_func.h"
+#include "../../company_base.h"
+#include "../../company_func.h"
 #include "../../tunnelbridge.h"
 
 
diff --git a/src/ai/trolly/shared.cpp b/src/ai/trolly/shared.cpp
index d08bfd7239..1183f0371f 100644
--- a/src/ai/trolly/shared.cpp
+++ b/src/ai/trolly/shared.cpp
@@ -7,7 +7,7 @@
 #include "../../debug.h"
 #include "../../map_func.h"
 #include "../../vehicle_base.h"
-#include "../../player_base.h"
+#include "../../company_base.h"
 #include "trolly.h"
 
 int AiNew_GetRailDirection(TileIndex tile_a, TileIndex tile_b, TileIndex tile_c)
diff --git a/src/ai/trolly/trolly.cpp b/src/ai/trolly/trolly.cpp
index 9ec6b937d4..23a67011b2 100644
--- a/src/ai/trolly/trolly.cpp
+++ b/src/ai/trolly/trolly.cpp
@@ -38,8 +38,8 @@
 #include "../../vehicle_func.h"
 #include "../../date_func.h"
 #include "../ai.h"
-#include "../../player_base.h"
-#include "../../player_func.h"
+#include "../../company_base.h"
+#include "../../company_func.h"
 
 #include "table/strings.h"
 
diff --git a/src/ai/trolly/trolly.h b/src/ai/trolly/trolly.h
index 2b11623e90..a1d8e0cd93 100644
--- a/src/ai/trolly/trolly.h
+++ b/src/ai/trolly/trolly.h
@@ -6,7 +6,7 @@
 #define AI_TROLLY_H
 
 #include "../../aystar.h"
-#include "../../player_type.h"
+#include "../../company_type.h"
 #include "../../vehicle_type.h"
 #include "../../date_type.h"
 #include "../../engine_type.h"
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index 16cce32525..ae79391955 100644
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -33,7 +33,7 @@
 #include "autoreplace_func.h"
 #include "autoreplace_gui.h"
 #include "gfx_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "settings_type.h"
 #include "order_func.h"
 #include "effectvehicle_func.h"
diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp
index da6e116641..573c4ed35d 100644
--- a/src/airport_gui.cpp
+++ b/src/airport_gui.cpp
@@ -16,11 +16,11 @@
 #include "settings_type.h"
 #include "viewport_func.h"
 #include "gfx_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "order_func.h"
 #include "station_type.h"
 #include "tilehighlight_func.h"
-#include "player_base.h"
+#include "company_base.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"
diff --git a/src/autoreplace_cmd.cpp b/src/autoreplace_cmd.cpp
index b7df99acba..98b3279355 100644
--- a/src/autoreplace_cmd.cpp
+++ b/src/autoreplace_cmd.cpp
@@ -4,7 +4,7 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "debug.h"
 #include "vehicle_gui.h"
 #include "train.h"
diff --git a/src/autoreplace_func.h b/src/autoreplace_func.h
index 6ca44fde00..5e1d777c16 100644
--- a/src/autoreplace_func.h
+++ b/src/autoreplace_func.h
@@ -6,7 +6,7 @@
 #define AUTOREPLACE_FUNC_H
 
 #include "autoreplace_type.h"
-#include "player_base.h"
+#include "company_base.h"
 
 /**
  * Remove all engine replacement settings for the company.
diff --git a/src/autoreplace_gui.cpp b/src/autoreplace_gui.cpp
index 71100f271e..2df91ec9fa 100644
--- a/src/autoreplace_gui.cpp
+++ b/src/autoreplace_gui.cpp
@@ -17,7 +17,7 @@
 #include "vehicle_func.h"
 #include "autoreplace_func.h"
 #include "gfx_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "widgets/dropdown_type.h"
 #include "widgets/dropdown_func.h"
 #include "engine_func.h"
diff --git a/src/autoslope.h b/src/autoslope.h
index b5ae320f07..eb0478cccf 100644
--- a/src/autoslope.h
+++ b/src/autoslope.h
@@ -6,7 +6,7 @@
 #define AUTOSLOPE_H
 
 #include "settings_type.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "depot_func.h"
 
 /**
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp
index 995cf8857e..a4f02fdbe6 100644
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -13,7 +13,7 @@
 #include "articulated_vehicles.h"
 #include "textbuf_gui.h"
 #include "command_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "airport.h"
 #include "vehicle_gui.h"
 #include "newgrf_engine.h"
diff --git a/src/cheat_gui.cpp b/src/cheat_gui.cpp
index 7c6e5a696e..b7cf687204 100644
--- a/src/cheat_gui.cpp
+++ b/src/cheat_gui.cpp
@@ -6,8 +6,8 @@
 #include "openttd.h"
 #include "command_func.h"
 #include "cheat_func.h"
-#include "player_base.h"
-#include "player_func.h"
+#include "company_base.h"
+#include "company_func.h"
 #include "gfx_func.h"
 #include "date_func.h"
 #include "saveload.h"
@@ -18,7 +18,7 @@
 #include "window_func.h"
 #include "rail_gui.h"
 #include "gui.h"
-#include "player_gui.h"
+#include "company_gui.h"
 #include "gamelog.h"
 
 #include "table/strings.h"
diff --git a/src/command.cpp b/src/command.cpp
index ad5a9cf12d..2d725237ca 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -18,8 +18,8 @@
 #include "town.h"
 #include "date_func.h"
 #include "debug.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "signal_func.h"
 
 #include "table/strings.h"
diff --git a/src/player_base.h b/src/company_base.h
similarity index 99%
rename from src/player_base.h
rename to src/company_base.h
index 17e67d0c6f..96603ca7b3 100644
--- a/src/player_base.h
+++ b/src/company_base.h
@@ -5,7 +5,7 @@
 #ifndef COMPANY_BASE_H
 #define COMPANY_BASE_H
 
-#include "player_type.h"
+#include "company_type.h"
 #include "oldpool.h"
 #include "road_type.h"
 #include "rail_type.h"
diff --git a/src/players.cpp b/src/company_cmd.cpp
similarity index 99%
rename from src/players.cpp
rename to src/company_cmd.cpp
index 824c47c91e..ecf100df5c 100644
--- a/src/players.cpp
+++ b/src/company_cmd.cpp
@@ -6,8 +6,8 @@
 #include "openttd.h"
 #include "engine_func.h"
 #include "engine_base.h"
-#include "player_func.h"
-#include "player_gui.h"
+#include "company_func.h"
+#include "company_gui.h"
 #include "town.h"
 #include "news_func.h"
 #include "saveload.h"
@@ -17,7 +17,7 @@
 #include "variables.h"
 #include "cheat_func.h"
 #include "ai/ai.h"
-#include "player_face.h"
+#include "company_manager_face.h"
 #include "group.h"
 #include "window_func.h"
 #include "tile_map.h"
diff --git a/src/player_func.h b/src/company_func.h
similarity index 98%
rename from src/player_func.h
rename to src/company_func.h
index 66f5161a92..1546d5a777 100644
--- a/src/player_func.h
+++ b/src/company_func.h
@@ -6,7 +6,7 @@
 #define COMPANY_FUNC_H
 
 #include "core/math_func.hpp"
-#include "player_type.h"
+#include "company_type.h"
 #include "tile_type.h"
 #include "strings_type.h"
 
diff --git a/src/player_gui.cpp b/src/company_gui.cpp
similarity index 99%
rename from src/player_gui.cpp
rename to src/company_gui.cpp
index cd057a6816..ac80f989a8 100644
--- a/src/player_gui.cpp
+++ b/src/company_gui.cpp
@@ -9,8 +9,8 @@
 #include "textbuf_gui.h"
 #include "viewport_func.h"
 #include "gfx_func.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "command_func.h"
 #include "network/network.h"
 #include "network/network_gui.h"
@@ -19,7 +19,7 @@
 #include "train.h"
 #include "aircraft.h"
 #include "newgrf.h"
-#include "player_face.h"
+#include "company_manager_face.h"
 #include "strings_func.h"
 #include "functions.h"
 #include "window_func.h"
diff --git a/src/player_gui.h b/src/company_gui.h
similarity index 94%
rename from src/player_gui.h
rename to src/company_gui.h
index 93f382789c..bdd93da087 100644
--- a/src/player_gui.h
+++ b/src/company_gui.h
@@ -5,7 +5,7 @@
 #ifndef COMPANY_GUI_H
 #define COMPANY_GUI_H
 
-#include "player_type.h"
+#include "company_type.h"
 
 uint16 GetDrawStringCompanyColor(CompanyID company);
 void DrawCompanyIcon(CompanyID p, int x, int y);
diff --git a/src/player_face.h b/src/company_manager_face.h
similarity index 100%
rename from src/player_face.h
rename to src/company_manager_face.h
diff --git a/src/player_type.h b/src/company_type.h
similarity index 100%
rename from src/player_type.h
rename to src/company_type.h
diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp
index d2eb3db4fa..0d1c8a84e0 100644
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -26,8 +26,8 @@
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "string_func.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "settings_type.h"
 #include "gamelog.h"
 
diff --git a/src/core/random_func.cpp b/src/core/random_func.cpp
index d47be6a4f6..bbbd38b9a4 100644
--- a/src/core/random_func.cpp
+++ b/src/core/random_func.cpp
@@ -37,7 +37,7 @@ void SetRandomSeed(uint32 seed)
 #ifdef RANDOM_DEBUG
 #include "../network/network_data.h"
 #include "../variables.h" /* _frame_counter */
-#include "../player_func.h"
+#include "../company_func.h"
 
 uint32 DoRandom(int line, const char *file)
 {
diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp
index 12cc79f253..2055cbcfaa 100644
--- a/src/depot_gui.cpp
+++ b/src/depot_gui.cpp
@@ -21,7 +21,7 @@
 #include "strings_func.h"
 #include "window_func.h"
 #include "vehicle_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "order_func.h"
 #include "depot_base.h"
 #include "tilehighlight_func.h"
diff --git a/src/disaster_cmd.cpp b/src/disaster_cmd.cpp
index 81d7bfaa69..3b9c8e1d4b 100644
--- a/src/disaster_cmd.cpp
+++ b/src/disaster_cmd.cpp
@@ -29,7 +29,7 @@
 #include "waypoint.h"
 #include "town.h"
 #include "industry.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "airport.h"
 #include "variables.h"
 #include "settings_type.h"
diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp
index b8a7851628..d9f11e1133 100644
--- a/src/dock_gui.cpp
+++ b/src/dock_gui.cpp
@@ -18,10 +18,10 @@
 #include "sound_func.h"
 #include "viewport_func.h"
 #include "gfx_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "slope_func.h"
 #include "tilehighlight_func.h"
-#include "player_base.h"
+#include "company_base.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"
diff --git a/src/economy.cpp b/src/economy.cpp
index 7523d4d5d2..8d068e71e5 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -6,8 +6,8 @@
 #include "openttd.h"
 #include "currency.h"
 #include "landscape.h"
-#include "player_base.h"
-#include "player_func.h"
+#include "company_base.h"
+#include "company_func.h"
 #include "command_func.h"
 #include "saveload.h"
 #include "industry.h"
@@ -44,7 +44,7 @@
 #include "signal_func.h"
 #include "gfx_func.h"
 #include "autoreplace_func.h"
-#include "player_gui.h"
+#include "company_gui.h"
 #include "signs_base.h"
 
 #include "table/strings.h"
diff --git a/src/economy_func.h b/src/economy_func.h
index 11f10207ac..e9c569832e 100644
--- a/src/economy_func.h
+++ b/src/economy_func.h
@@ -12,7 +12,7 @@
 #include "tile_type.h"
 #include "town_type.h"
 #include "industry_type.h"
-#include "player_type.h"
+#include "company_type.h"
 #include "station_type.h"
 
 void ResetPriceBaseMultipliers();
diff --git a/src/effectvehicle.cpp b/src/effectvehicle.cpp
index 32482adf8d..5caae25dab 100644
--- a/src/effectvehicle.cpp
+++ b/src/effectvehicle.cpp
@@ -16,7 +16,7 @@
 #include "news_func.h"
 #include "command_func.h"
 #include "saveload.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "debug.h"
 #include "vehicle_gui.h"
 #include "rail_type.h"
diff --git a/src/elrail.cpp b/src/elrail.cpp
index 627c7584c3..b870c4bb23 100644
--- a/src/elrail.cpp
+++ b/src/elrail.cpp
@@ -64,7 +64,7 @@
 #include "transparency.h"
 #include "tunnelbridge_map.h"
 #include "vehicle_func.h"
-#include "player_base.h"
+#include "company_base.h"
 #include "tunnelbridge.h"
 #include "engine_func.h"
 #include "elrail_func.h"
diff --git a/src/engine.cpp b/src/engine.cpp
index f6dff726d8..bef633d35c 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -5,8 +5,8 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
-#include "player_base.h"
-#include "player_func.h"
+#include "company_base.h"
+#include "company_func.h"
 #include "command_func.h"
 #include "news_func.h"
 #include "saveload.h"
diff --git a/src/engine_type.h b/src/engine_type.h
index cfe2843678..5f6cdd2719 100644
--- a/src/engine_type.h
+++ b/src/engine_type.h
@@ -11,7 +11,7 @@
 #include "gfx_type.h"
 #include "date_type.h"
 #include "sound_type.h"
-#include "player_type.h"
+#include "company_type.h"
 #include "strings_type.h"
 
 typedef uint16 EngineID;
diff --git a/src/genworld.cpp b/src/genworld.cpp
index edccdbfc87..2bb573a6e3 100644
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -5,7 +5,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "landscape.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "variables.h"
 #include "thread.h"
 #include "command_func.h"
diff --git a/src/genworld.h b/src/genworld.h
index 3739db874c..8bc476dbca 100644
--- a/src/genworld.h
+++ b/src/genworld.h
@@ -5,7 +5,7 @@
 #ifndef GENWORLD_H
 #define GENWORLD_H
 
-#include "player_type.h"
+#include "company_type.h"
 
 /*
  * Order of these enums has to be the same as in lang/english.txt
diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp
index 1488e9abd7..199248cd42 100644
--- a/src/graph_gui.cpp
+++ b/src/graph_gui.cpp
@@ -6,8 +6,8 @@
 #include "openttd.h"
 #include "gui.h"
 #include "window_gui.h"
-#include "player_base.h"
-#include "player_gui.h"
+#include "company_base.h"
+#include "company_gui.h"
 #include "economy_func.h"
 #include "variables.h"
 #include "cargotype.h"
diff --git a/src/group.h b/src/group.h
index eccc2498b2..24f0b03a8b 100644
--- a/src/group.h
+++ b/src/group.h
@@ -7,7 +7,7 @@
 
 #include "group_type.h"
 #include "oldpool.h"
-#include "player_type.h"
+#include "company_type.h"
 #include "vehicle_type.h"
 #include "engine_type.h"
 
diff --git a/src/group_cmd.cpp b/src/group_cmd.cpp
index 5ff58c8460..46ab84b2b8 100644
--- a/src/group_cmd.cpp
+++ b/src/group_cmd.cpp
@@ -19,7 +19,7 @@
 #include "autoreplace_base.h"
 #include "autoreplace_func.h"
 #include "string_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "order_func.h"
 #include "oldpool_func.h"
 #include "core/alloc_func.hpp"
diff --git a/src/group_gui.cpp b/src/group_gui.cpp
index d310a4c84a..42f6871278 100644
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -21,7 +21,7 @@
 #include "string_func.h"
 #include "viewport_func.h"
 #include "gfx_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "widgets/dropdown_type.h"
 #include "widgets/dropdown_func.h"
 #include "tilehighlight_func.h"
diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp
index 58116f0810..46d8f21f07 100644
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -22,13 +22,13 @@
 #include "newgrf_text.h"
 #include "strings_func.h"
 #include "map_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "settings_type.h"
 #include "tilehighlight_func.h"
 #include "string_func.h"
 #include "sortlist_type.h"
 #include "widgets/dropdown_func.h"
-#include "player_base.h"
+#include "company_base.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"
diff --git a/src/livery.h b/src/livery.h
index 719aeb7981..0ef541905a 100644
--- a/src/livery.h
+++ b/src/livery.h
@@ -5,7 +5,7 @@
 #ifndef LIVERY_H
 #define LIVERY_H
 
-#include "player_type.h"
+#include "company_type.h"
 
 /* List of different livery schemes. */
 enum LiveryScheme {
diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index 4140889704..21eedb9c07 100644
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -24,9 +24,9 @@
 #include "strings_func.h"
 #include "zoom_func.h"
 #include "string_func.h"
-#include "player_base.h"
-#include "player_func.h"
-#include "player_gui.h"
+#include "company_base.h"
+#include "company_func.h"
+#include "company_gui.h"
 #include "settings_type.h"
 #include "toolbar_gui.h"
 #include "statusbar_gui.h"
diff --git a/src/misc_cmd.cpp b/src/misc_cmd.cpp
index 572cf0cefe..319d0d6ad3 100644
--- a/src/misc_cmd.cpp
+++ b/src/misc_cmd.cpp
@@ -12,15 +12,15 @@
 #include "network/network.h"
 #include "variables.h"
 #include "livery.h"
-#include "player_face.h"
+#include "company_manager_face.h"
 #include "strings_func.h"
 #include "gfx_func.h"
 #include "functions.h"
 #include "vehicle_func.h"
 #include "string_func.h"
-#include "player_func.h"
-#include "player_base.h"
-#include "player_gui.h"
+#include "company_func.h"
+#include "company_base.h"
+#include "company_gui.h"
 #include "settings_type.h"
 
 #include "table/strings.h"
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index bda46aded9..e9d3749907 100644
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -19,8 +19,8 @@
 #include "gfx_func.h"
 #include "station_func.h"
 #include "command_func.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "town.h"
 #include "network/network.h"
 #include "variables.h"
@@ -28,7 +28,7 @@
 #include "train.h"
 #include "tgp.h"
 #include "cargotype.h"
-#include "player_face.h"
+#include "company_manager_face.h"
 #include "strings_func.h"
 #include "fileio_func.h"
 #include "fios.h"
@@ -39,13 +39,13 @@
 #include "date_func.h"
 #include "sound_func.h"
 #include "string_func.h"
-#include "player_gui.h"
+#include "company_gui.h"
 #include "settings_type.h"
 #include "newgrf_cargo.h"
 #include "rail_gui.h"
 #include "tilehighlight_func.h"
 #include "querystring_gui.h"
-#include "player_base.h"
+#include "company_base.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"
diff --git a/src/network/network.cpp b/src/network/network.cpp
index 0033f4030b..d3e5d89860 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -3,7 +3,7 @@
 /** @file network.cpp Base functions for networking support. */
 
 #include "../stdafx.h"
-#include "../player_type.h"
+#include "../company_type.h"
 
 #ifdef ENABLE_NETWORK
 
@@ -32,7 +32,7 @@
 #include "../core/random_func.hpp"
 #include "../window_func.h"
 #include "../string_func.h"
-#include "../player_func.h"
+#include "../company_func.h"
 #include "../settings_type.h"
 #include "../landscape_type.h"
 #include "../rev.h"
@@ -40,7 +40,7 @@
 	#include "../core/alloc_func.hpp"
 #endif /* DEBUG_DUMP_COMMANDS */
 #include "table/strings.h"
-#include "../player_base.h"
+#include "../company_base.h"
 
 bool _network_server;     ///< network-server is active
 bool _network_available;  ///< is network mode available?
diff --git a/src/network/network.h b/src/network/network.h
index 4413785639..cbad95d980 100644
--- a/src/network/network.h
+++ b/src/network/network.h
@@ -5,7 +5,7 @@
 #ifndef NETWORK_H
 #define NETWORK_H
 
-#include "../player_type.h"
+#include "../company_type.h"
 
 #ifdef ENABLE_NETWORK
 
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index d7eeb515bd..0947f37a50 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -23,9 +23,9 @@
 #include "../strings_func.h"
 #include "../window_func.h"
 #include "../string_func.h"
-#include "../player_func.h"
-#include "../player_base.h"
-#include "../player_gui.h"
+#include "../company_func.h"
+#include "../company_base.h"
+#include "../company_gui.h"
 #include "../rev.h"
 
 #include "table/strings.h"
diff --git a/src/network/network_data.cpp b/src/network/network_data.cpp
index 914f6d40cf..767d66cdf3 100644
--- a/src/network/network_data.cpp
+++ b/src/network/network_data.cpp
@@ -13,7 +13,7 @@
 #include "../core/alloc_func.hpp"
 #include "../string_func.h"
 #include "../date_func.h"
-#include "../player_func.h"
+#include "../company_func.h"
 
 // Add a command to the local command queue
 void NetworkAddCommandQueue(NetworkTCPSocketHandler *cs, CommandPacket *cp)
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index 3cc9e17b83..2a609c6d47 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -24,12 +24,12 @@
 #include "../core/alloc_func.hpp"
 #include "../string_func.h"
 #include "../gfx_func.h"
-#include "../player_func.h"
+#include "../company_func.h"
 #include "../settings_type.h"
 #include "../widgets/dropdown_func.h"
 #include "../querystring_gui.h"
 #include "../sortlist_type.h"
-#include "../player_base.h"
+#include "../company_base.h"
 
 #include "table/strings.h"
 #include "../table/sprites.h"
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index e99ef8bc1a..07171bbe21 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -24,9 +24,9 @@
 #include "../core/alloc_func.hpp"
 #include "../fileio_func.h"
 #include "../string_func.h"
-#include "../player_base.h"
-#include "../player_func.h"
-#include "../player_gui.h"
+#include "../company_base.h"
+#include "../company_func.h"
+#include "../company_gui.h"
 #include "../settings_type.h"
 
 #include "table/strings.h"
diff --git a/src/network/network_type.h b/src/network/network_type.h
index b0258a37aa..c26c84738c 100644
--- a/src/network/network_type.h
+++ b/src/network/network_type.h
@@ -7,7 +7,7 @@
 
 #ifdef ENABLE_NETWORK
 
-#include "../player_type.h"
+#include "../company_type.h"
 #include "../economy_type.h"
 #include "core/config.h"
 #include "core/game.h"
diff --git a/src/network/network_udp.cpp b/src/network/network_udp.cpp
index c2b0aba8cd..070f17e1ad 100644
--- a/src/network/network_udp.cpp
+++ b/src/network/network_udp.cpp
@@ -21,8 +21,8 @@
 #include "../newgrf_config.h"
 #include "../core/endian_func.hpp"
 #include "../string_func.h"
-#include "../player_base.h"
-#include "../player_func.h"
+#include "../company_base.h"
+#include "../company_func.h"
 #include "../settings_type.h"
 #include "../rev.h"
 
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index 18c95bbd18..bc922e1560 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -44,7 +44,7 @@
 #include "sound_func.h"
 #include "string_func.h"
 #include "road_func.h"
-#include "player_base.h"
+#include "company_base.h"
 #include "settings_type.h"
 #include "network/network.h"
 #include "map_func.h"
diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp
index 8a78f17b74..4679f2b7e4 100644
--- a/src/newgrf_engine.cpp
+++ b/src/newgrf_engine.cpp
@@ -9,8 +9,8 @@
 #include "engine_func.h"
 #include "engine_base.h"
 #include "train.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "station_base.h"
 #include "airport.h"
 #include "newgrf.h"
diff --git a/src/newgrf_house.cpp b/src/newgrf_house.cpp
index 290e358e2e..b7907945f0 100644
--- a/src/newgrf_house.cpp
+++ b/src/newgrf_house.cpp
@@ -20,10 +20,10 @@
 #include "newgrf_commons.h"
 #include "transparency.h"
 #include "functions.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "animated_tile_func.h"
 #include "date_func.h"
-#include "player_base.h"
+#include "company_base.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"
diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp
index d7fd441ae9..ebcf20ecb3 100644
--- a/src/newgrf_industries.cpp
+++ b/src/newgrf_industries.cpp
@@ -19,8 +19,8 @@
 #include "newgrf_town.h"
 #include "window_func.h"
 #include "town.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "command_func.h"
 
 #include "table/strings.h"
diff --git a/src/newgrf_station.cpp b/src/newgrf_station.cpp
index 103ff25f8c..ae13dfcca5 100644
--- a/src/newgrf_station.cpp
+++ b/src/newgrf_station.cpp
@@ -22,7 +22,7 @@
 #include "newgrf_town.h"
 #include "gfx_func.h"
 #include "date_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "animated_tile_func.h"
 #include "functions.h"
 #include "tunnelbridge_map.h"
diff --git a/src/news_gui.cpp b/src/news_gui.cpp
index 5018c48aaa..8da8fa3d51 100644
--- a/src/news_gui.cpp
+++ b/src/news_gui.cpp
@@ -19,7 +19,7 @@
 #include "widgets/dropdown_func.h"
 #include "map_func.h"
 #include "statusbar_gui.h"
-#include "player_face.h"
+#include "company_manager_face.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"
diff --git a/src/npf.h b/src/npf.h
index bf19b62d5b..7bfe226a46 100644
--- a/src/npf.h
+++ b/src/npf.h
@@ -8,7 +8,7 @@
 #include "aystar.h"
 #include "station_type.h"
 #include "rail_type.h"
-#include "player_type.h"
+#include "company_type.h"
 #include "vehicle_type.h"
 #include "tile_type.h"
 #include "track_type.h"
diff --git a/src/oldloader.cpp b/src/oldloader.cpp
index db987951ea..708ab3a7cf 100644
--- a/src/oldloader.cpp
+++ b/src/oldloader.cpp
@@ -7,8 +7,8 @@
 #include "station_map.h"
 #include "town.h"
 #include "industry.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "aircraft.h"
 #include "roadveh.h"
 #include "ship.h"
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 95df73f247..9d1517474b 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -27,8 +27,8 @@
 #include "debug.h"
 #include "saveload.h"
 #include "landscape.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "command_func.h"
 #include "town.h"
 #include "industry.h"
@@ -49,7 +49,7 @@
 #include "yapf/yapf.h"
 #include "settings_func.h"
 #include "genworld.h"
-#include "player_face.h"
+#include "company_manager_face.h"
 #include "group.h"
 #include "strings_func.h"
 #include "date_func.h"
diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp
index efe853e2fc..108df68300 100644
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -10,7 +10,7 @@
 #include "order_base.h"
 #include "waypoint.h"
 #include "command_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "news_func.h"
 #include "saveload.h"
 #include "vehicle_gui.h"
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index ce8a61545f..9a60c45097 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -24,7 +24,7 @@
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "settings_type.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "newgrf_cargo.h"
 #include "widgets/dropdown_func.h"
 #include "textbuf_gui.h"
diff --git a/src/rail.cpp b/src/rail.cpp
index 61f9218be6..6e2b141e71 100644
--- a/src/rail.cpp
+++ b/src/rail.cpp
@@ -11,8 +11,8 @@
 #include "tunnelbridge_map.h"
 #include "settings_type.h"
 #include "date_func.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "engine_func.h"
 #include "engine_base.h"
 
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index ba29514771..89e3e2ac3b 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -26,7 +26,7 @@
 #include "window_func.h"
 #include "date_func.h"
 #include "sound_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "settings_type.h"
 #include "widgets/dropdown_type.h"
 #include "widgets/dropdown_func.h"
diff --git a/src/road.cpp b/src/road.cpp
index add184f695..e8d3062fcd 100644
--- a/src/road.cpp
+++ b/src/road.cpp
@@ -9,8 +9,8 @@
 #include "road_internal.h"
 #include "water_map.h"
 #include "genworld.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "engine_func.h"
 #include "engine_base.h"
 #include "settings_type.h"
diff --git a/src/road_func.h b/src/road_func.h
index 264bc21f4e..4b96cd608b 100644
--- a/src/road_func.h
+++ b/src/road_func.h
@@ -8,7 +8,7 @@
 #include "core/bitmath_func.hpp"
 #include "road_type.h"
 #include "direction_func.h"
-#include "player_type.h"
+#include "company_type.h"
 
 /**
  * Whether the given roadtype is valid.
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index ca45f35fe1..bade9c5d00 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -20,11 +20,11 @@
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "settings_type.h"
 #include "tunnelbridge.h"
 #include "tilehighlight_func.h"
-#include "player_base.h"
+#include "company_base.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index cf9810be5a..091ad876e2 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -15,8 +15,8 @@
 #include "news_func.h"
 #include "pathfind.h"
 #include "npf.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "bridge.h"
 #include "tunnel_map.h"
 #include "bridge_map.h"
diff --git a/src/screenshot.cpp b/src/screenshot.cpp
index d8c310f052..49bc132b64 100644
--- a/src/screenshot.cpp
+++ b/src/screenshot.cpp
@@ -18,7 +18,7 @@
 #include "core/endian_func.hpp"
 #include "map_func.h"
 #include "date_func.h"
-#include "player_func.h"
+#include "company_func.h"
 
 #include "table/strings.h"
 
diff --git a/src/settings.cpp b/src/settings.cpp
index 29343c280a..541a2c4807 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -43,7 +43,7 @@
 #include "vehicle_func.h"
 #include "sound_func.h"
 #include "core/alloc_func.hpp"
-#include "player_func.h"
+#include "company_func.h"
 #include "rev.h"
 #ifdef WITH_FREETYPE
 #include "fontcache.h"
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index 1720395312..7928d15195 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -15,8 +15,8 @@
 #include "news_func.h"
 #include "engine_func.h"
 #include "engine_base.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "npf.h"
 #include "depot_base.h"
 #include "depot_func.h"
diff --git a/src/signal.cpp b/src/signal.cpp
index aa2c753d54..98881c7f05 100644
--- a/src/signal.cpp
+++ b/src/signal.cpp
@@ -17,7 +17,7 @@
 #include "track_type.h"
 #include "track_func.h"
 #include "signal_func.h"
-#include "player_func.h"
+#include "company_func.h"
 
 
 /** these are the maximums used for updating signal blocks */
diff --git a/src/signal_func.h b/src/signal_func.h
index 7e35168111..ec4ce48d90 100644
--- a/src/signal_func.h
+++ b/src/signal_func.h
@@ -9,7 +9,7 @@
 #include "tile_type.h"
 #include "direction_type.h"
 #include "track_type.h"
-#include "player_type.h"
+#include "company_type.h"
 
 /**
  * Maps a trackdir to the bit that stores its status in the map arrays, in the
diff --git a/src/signs.cpp b/src/signs.cpp
index c9da4655d1..5034626515 100644
--- a/src/signs.cpp
+++ b/src/signs.cpp
@@ -5,7 +5,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "landscape.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "signs_base.h"
 #include "signs_func.h"
 #include "saveload.h"
diff --git a/src/signs_gui.cpp b/src/signs_gui.cpp
index eee35a2c8b..714299f62f 100644
--- a/src/signs_gui.cpp
+++ b/src/signs_gui.cpp
@@ -7,8 +7,8 @@
 #include "gui.h"
 #include "textbuf_gui.h"
 #include "window_gui.h"
-#include "player_gui.h"
-#include "player_func.h"
+#include "company_gui.h"
+#include "company_func.h"
 #include "signs_base.h"
 #include "signs_func.h"
 #include "debug.h"
diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp
index 7be78da547..5c993cc2c0 100644
--- a/src/smallmap_gui.cpp
+++ b/src/smallmap_gui.cpp
@@ -16,7 +16,7 @@
 #include "tunnel_map.h"
 #include "viewport_func.h"
 #include "gfx_func.h"
-#include "player_base.h"
+#include "company_base.h"
 #include "town.h"
 #include "variables.h"
 #include "blitter/factory.hpp"
diff --git a/src/station.cpp b/src/station.cpp
index 0486f1280f..356bb0151e 100644
--- a/src/station.cpp
+++ b/src/station.cpp
@@ -10,7 +10,7 @@
 #include "station_base.h"
 #include "town.h"
 #include "saveload.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "airport.h"
 #include "sprite.h"
 #include "train.h"
diff --git a/src/station_base.h b/src/station_base.h
index b6dd455538..4bdc9270c6 100644
--- a/src/station_base.h
+++ b/src/station_base.h
@@ -14,7 +14,7 @@
 #include "strings_type.h"
 #include "date_type.h"
 #include "vehicle_type.h"
-#include "player_type.h"
+#include "company_type.h"
 #include "core/geometry_type.hpp"
 #include "viewport_type.h"
 #include <list>
diff --git a/src/station_gui.cpp b/src/station_gui.cpp
index 88d023ea04..da5cc57739 100644
--- a/src/station_gui.cpp
+++ b/src/station_gui.cpp
@@ -9,7 +9,7 @@
 #include "window_gui.h"
 #include "textbuf_gui.h"
 #include "station_base.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "economy_func.h"
 #include "town.h"
 #include "command_func.h"
@@ -26,7 +26,7 @@
 #include "widgets/dropdown_func.h"
 #include "newgrf_cargo.h"
 #include "string_func.h"
-#include "player_base.h"
+#include "company_base.h"
 #include "sortlist_type.h"
 
 #include "table/strings.h"
diff --git a/src/statusbar_gui.cpp b/src/statusbar_gui.cpp
index 692b0a8a5a..c125b16cc4 100644
--- a/src/statusbar_gui.cpp
+++ b/src/statusbar_gui.cpp
@@ -8,13 +8,13 @@
 #include "date_func.h"
 #include "gfx_func.h"
 #include "news_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "string_func.h"
 #include "strings_func.h"
-#include "player_base.h"
+#include "company_base.h"
 #include "tilehighlight_func.h"
 #include "news_gui.h"
-#include "player_gui.h"
+#include "company_gui.h"
 #include "window_gui.h"
 #include "variables.h"
 #include "window_func.h"
diff --git a/src/strings.cpp b/src/strings.cpp
index 8451132975..9059f56a17 100644
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -32,8 +32,8 @@
 #include "date_func.h"
 #include "vehicle_base.h"
 #include "string_func.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "fios.h"
 #include "settings_type.h"
 #include "video/video_driver.hpp"
diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp
index 7e0fcf1467..4fc09ad762 100644
--- a/src/terraform_gui.cpp
+++ b/src/terraform_gui.cpp
@@ -6,8 +6,8 @@
 #include "openttd.h"
 #include "bridge_map.h"
 #include "clear_map.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "gui.h"
 #include "window_gui.h"
 #include "viewport_func.h"
diff --git a/src/tile_cmd.h b/src/tile_cmd.h
index 9faa1f0daa..fc6f568467 100644
--- a/src/tile_cmd.h
+++ b/src/tile_cmd.h
@@ -12,7 +12,7 @@
 #include "cargo_type.h"
 #include "strings_type.h"
 #include "date_type.h"
-#include "player_type.h"
+#include "company_type.h"
 #include "direction_type.h"
 #include "track_type.h"
 #include "transport_type.h"
diff --git a/src/tile_map.h b/src/tile_map.h
index 96678cdc46..f9ce5ddc9e 100644
--- a/src/tile_map.h
+++ b/src/tile_map.h
@@ -7,7 +7,7 @@
 
 #include "tile_type.h"
 #include "slope_type.h"
-#include "player_type.h"
+#include "company_type.h"
 #include "map_func.h"
 #include "core/bitmath_func.hpp"
 
diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp
index 0007b63f1a..813354874a 100644
--- a/src/timetable_gui.cpp
+++ b/src/timetable_gui.cpp
@@ -14,7 +14,7 @@
 #include "vehicle_base.h"
 #include "string_func.h"
 #include "gfx_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "order_func.h"
 #include "settings_type.h"
 
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index 99cf36a439..5effaed7b9 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -21,9 +21,9 @@
 #include "terraform_gui.h"
 #include "transparency.h"
 #include "strings_func.h"
-#include "player_base.h"
-#include "player_func.h"
-#include "player_gui.h"
+#include "company_base.h"
+#include "company_func.h"
+#include "company_gui.h"
 #include "settings_type.h"
 #include "toolbar_gui.h"
 #include "vehicle_base.h"
diff --git a/src/town.h b/src/town.h
index bff83a87fe..eacb863ce6 100644
--- a/src/town.h
+++ b/src/town.h
@@ -12,7 +12,7 @@
 #include "tile_type.h"
 #include "date_type.h"
 #include "town_type.h"
-#include "player_type.h"
+#include "company_type.h"
 #include "settings_type.h"
 #include "strings_type.h"
 #include "viewport_type.h"
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp
index 58454636e7..ccad4c0c4a 100644
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -16,7 +16,7 @@
 #include "command_func.h"
 #include "industry.h"
 #include "station_base.h"
-#include "player_base.h"
+#include "company_base.h"
 #include "news_func.h"
 #include "saveload.h"
 #include "gui.h"
diff --git a/src/town_gui.cpp b/src/town_gui.cpp
index 59b73bae9e..aee2528925 100644
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@@ -12,9 +12,9 @@
 #include "window_gui.h"
 #include "textbuf_gui.h"
 #include "command_func.h"
-#include "player_func.h"
-#include "player_base.h"
-#include "player_gui.h"
+#include "company_func.h"
+#include "company_base.h"
+#include "company_gui.h"
 #include "network/network.h"
 #include "variables.h"
 #include "strings_func.h"
diff --git a/src/town_type.h b/src/town_type.h
index 3cb4151be2..817e19df7a 100644
--- a/src/town_type.h
+++ b/src/town_type.h
@@ -43,9 +43,9 @@ enum {
 	RATING_TREE_UP_STEP   = 7,
 	RATING_TREE_MAXIMUM   = 220,
 
-	RATING_GROWTH_UP_STEP    =   5, ///< when a town grows, all players have rating increased a bit ...
+	RATING_GROWTH_UP_STEP    =   5, ///< when a town grows, all companies have rating increased a bit ...
 	RATING_GROWTH_MAXIMUM    = RATING_MEDIOCRE, ///< ... up to RATING_MEDIOCRE
-	RATING_STATION_UP_STEP   =  12, ///< when a town grows, player gains reputation for all well serviced stations ...
+	RATING_STATION_UP_STEP   =  12, ///< when a town grows, company gains reputation for all well serviced stations ...
 	RATING_STATION_DOWN_STEP = -15, ///< ... but loses for bad serviced stations
 
 	RATING_TUNNEL_BRIDGE_DOWN_STEP = -250,
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 5ec65ce3df..7b99dd0c86 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -19,8 +19,8 @@
 #include "news_func.h"
 #include "engine_func.h"
 #include "engine_base.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "depot_base.h"
 #include "depot_func.h"
 #include "waypoint.h"
diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp
index 7f30f977dd..0a728dd3f4 100644
--- a/src/tree_cmd.cpp
+++ b/src/tree_cmd.cpp
@@ -17,13 +17,13 @@
 #include "genworld.h"
 #include "transparency.h"
 #include "functions.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "sound_func.h"
 #include "settings_type.h"
 #include "water_map.h"
 #include "water.h"
 #include "landscape_type.h"
-#include "player_base.h"
+#include "company_base.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"
diff --git a/src/tree_gui.cpp b/src/tree_gui.cpp
index a310628fe6..a35f95c74c 100644
--- a/src/tree_gui.cpp
+++ b/src/tree_gui.cpp
@@ -7,8 +7,8 @@
 #include "window_gui.h"
 #include "gfx_func.h"
 #include "tilehighlight_func.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "command_func.h"
 #include "sound_func.h"
 #include "settings_type.h"
diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp
index c5869fce92..bda65becd0 100644
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -33,7 +33,7 @@
 #include "sound_func.h"
 #include "signal_func.h"
 #include "tunnelbridge.h"
-#include "player_base.h"
+#include "company_base.h"
 #include "engine_func.h"
 #include "engine_base.h"
 #include "economy_func.h"
diff --git a/src/unmovable_cmd.cpp b/src/unmovable_cmd.cpp
index 7bf37a4144..3a6829c9d1 100644
--- a/src/unmovable_cmd.cpp
+++ b/src/unmovable_cmd.cpp
@@ -8,8 +8,8 @@
 #include "landscape.h"
 #include "command_func.h"
 #include "viewport_func.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "gui.h"
 #include "town.h"
 #include "sprite.h"
@@ -23,7 +23,7 @@
 #include "functions.h"
 #include "window_func.h"
 #include "vehicle_func.h"
-#include "player_gui.h"
+#include "company_gui.h"
 #include "station_type.h"
 #include "economy_func.h"
 #include "cheat_func.h"
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index c060ea9af6..654368d0d6 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -16,7 +16,7 @@
 #include "news_func.h"
 #include "command_func.h"
 #include "saveload.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "debug.h"
 #include "vehicle_gui.h"
 #include "rail_type.h"
diff --git a/src/vehicle_base.h b/src/vehicle_base.h
index d3368d2fc8..39f2673c40 100644
--- a/src/vehicle_base.h
+++ b/src/vehicle_base.h
@@ -14,8 +14,8 @@
 #include "gfx_type.h"
 #include "command_type.h"
 #include "date_type.h"
-#include "player_base.h"
-#include "player_type.h"
+#include "company_base.h"
+#include "company_type.h"
 #include "oldpool.h"
 #include "order_base.h"
 #include "cargopacket.h"
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 79c21d62a1..fb45c09014 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -5,7 +5,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "gui.h"
 #include "window_gui.h"
 #include "textbuf_gui.h"
diff --git a/src/video/dedicated_v.cpp b/src/video/dedicated_v.cpp
index 89cec2df90..bd3a1bd2ff 100644
--- a/src/video/dedicated_v.cpp
+++ b/src/video/dedicated_v.cpp
@@ -18,7 +18,7 @@
 #include "../fios.h"
 #include "../blitter/factory.hpp"
 #include "../core/alloc_func.hpp"
-#include "../player_func.h"
+#include "../company_func.h"
 #include "../core/random_func.hpp"
 #include "dedicated_v.h"
 
diff --git a/src/viewport.cpp b/src/viewport.cpp
index a4d9de0d4b..9448a51dd7 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -40,7 +40,7 @@
 #include "strings_func.h"
 #include "zoom_func.h"
 #include "vehicle_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "settings_type.h"
 #include "station_func.h"
 #include "core/alloc_type.hpp"
diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp
index ae728f546d..fe79383849 100644
--- a/src/water_cmd.cpp
+++ b/src/water_cmd.cpp
@@ -31,7 +31,7 @@
 #include "vehicle_func.h"
 #include "sound_func.h"
 #include "variables.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "settings_type.h"
 #include "clear_map.h"
 #include "tree_map.h"
diff --git a/src/waypoint.cpp b/src/waypoint.cpp
index ecf8bbb6eb..8d70518b5b 100644
--- a/src/waypoint.cpp
+++ b/src/waypoint.cpp
@@ -28,7 +28,7 @@
 #include "vehicle_base.h"
 #include "string_func.h"
 #include "signal_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "settings_type.h"
 #include "newgrf_station.h"
 #include "oldpool_func.h"
diff --git a/src/widget.cpp b/src/widget.cpp
index 4ae7497c1e..241bb8a2f2 100644
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -5,7 +5,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "core/math_func.hpp"
-#include "player_func.h"
+#include "company_func.h"
 #include "gfx_func.h"
 #include "window_gui.h"
 #include "window_func.h"
diff --git a/src/window.cpp b/src/window.cpp
index abf66042ce..605edbd0d7 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -6,7 +6,7 @@
 #include <stdarg.h>
 #include "openttd.h"
 #include "debug.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "gfx_func.h"
 #include "console_func.h"
 #include "console_gui.h"
diff --git a/src/window_func.h b/src/window_func.h
index f60ce517a0..fb6b290e57 100644
--- a/src/window_func.h
+++ b/src/window_func.h
@@ -6,7 +6,7 @@
 #define WINDOW_FUNC_H
 
 #include "window_type.h"
-#include "player_type.h"
+#include "company_type.h"
 
 void SetWindowDirty(const Window *w);
 
diff --git a/src/window_gui.h b/src/window_gui.h
index 2824f337fb..a1fc734645 100644
--- a/src/window_gui.h
+++ b/src/window_gui.h
@@ -9,7 +9,7 @@
 #include "core/geometry_type.hpp"
 #include "vehicle_type.h"
 #include "viewport_type.h"
-#include "player_type.h"
+#include "company_type.h"
 #include "strings_type.h"
 #include "core/alloc_type.hpp"
 #include "window_type.h"