diff --git a/source.list b/source.list
index cc379d67cb..918ff3de53 100644
--- a/source.list
+++ b/source.list
@@ -614,8 +614,8 @@ zoning_cmd.cpp
 bitstream.cpp
 citymania/base64.h
 citymania/base64.cpp
-citymania/zoning.hpp
-citymania/zoning.cpp
+citymania/highlight.hpp
+citymania/highlight.cpp
 newgrf_revisions.hpp
 
 # Save/Load handlers
diff --git a/src/citymania/zoning.cpp b/src/citymania/highlight.cpp
similarity index 99%
rename from src/citymania/zoning.cpp
rename to src/citymania/highlight.cpp
index a8a0ccb5f4..e61cc7d1cd 100644
--- a/src/citymania/zoning.cpp
+++ b/src/citymania/highlight.cpp
@@ -1,6 +1,6 @@
 #include "../stdafx.h"
 
-#include "zoning.hpp"
+#include "highlight.hpp"
 
 #include "../core/math_func.hpp"
 #include "../house.h"
diff --git a/src/citymania/zoning.hpp b/src/citymania/highlight.hpp
similarity index 100%
rename from src/citymania/zoning.hpp
rename to src/citymania/highlight.hpp
diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp
index 29a4939e7d..8d247fb160 100644
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -44,7 +44,7 @@
 
 #include <bitset>
 
-#include "citymania/zoning.hpp"
+#include "citymania/highlight.hpp"
 
 #include "safeguards.h"
 
diff --git a/src/map.cpp b/src/map.cpp
index e0c0b511d0..dff4ded676 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -12,7 +12,7 @@
 #include "core/alloc_func.hpp"
 #include "water_map.h"
 #include "string_func.h"
-#include "citymania/zoning.hpp"
+#include "citymania/highlight.hpp"
 
 #include "safeguards.h"
 
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 6fabd78e86..6bde889d01 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -67,7 +67,7 @@
 
 #include "linkgraph/linkgraphschedule.h"
 
-#include "citymania/zoning.hpp"
+#include "citymania/highlight.hpp"
 
 #include <stdarg.h>
 #include <system_error>
diff --git a/src/rev.cpp b/src/rev.cpp
index b71dd4dd2d..7d6b2ec00f 100644
--- a/src/rev.cpp
+++ b/src/rev.cpp
@@ -83,4 +83,4 @@ const byte _openttd_revision_tagged = 1;
 const uint32 _openttd_newgrf_version = 1 << 28 | 10 << 24 | 0 << 20 | 0 << 19 | 28004;
 
 
-const char _citymania_version[] = "20200206-master-me7f1df5454 06.02.20";
+const char _citymania_version[] = "20200207-master-m0455a24b30 07.02.20";
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index 92dc86cf72..f507db56d1 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -61,7 +61,7 @@
 #include "../game/game_text.hpp"
 #include "../table/control_codes.h"
 
-#include "../citymania/zoning.hpp"
+#include "../citymania/highlight.hpp"
 
 #include "saveload_internal.h"
 
diff --git a/src/station_gui.cpp b/src/station_gui.cpp
index de6d9e2240..104a37c8e8 100644
--- a/src/station_gui.cpp
+++ b/src/station_gui.cpp
@@ -39,7 +39,7 @@
 #include <set>
 #include <vector>
 
-#include "citymania/zoning.hpp"
+#include "citymania/highlight.hpp"
 
 #include "safeguards.h"
 
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp
index 4e709acfe8..7fb0ebf639 100644
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -52,7 +52,7 @@
 #include "table/strings.h"
 #include "table/town_land.h"
 
-#include "citymania/zoning.hpp"
+#include "citymania/highlight.hpp"
 
 #include "safeguards.h"
 
diff --git a/src/viewport.cpp b/src/viewport.cpp
index 6d17c7d144..f93b504625 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -99,7 +99,7 @@
 #include "zoning.h"
 #include "industry_type.h"
 
-#include "citymania/zoning.hpp"
+#include "citymania/highlight.hpp"
 
 #include "safeguards.h"
 
diff --git a/src/zoning_cmd.cpp b/src/zoning_cmd.cpp
index 9f00f6f464..4869a7737e 100644
--- a/src/zoning_cmd.cpp
+++ b/src/zoning_cmd.cpp
@@ -9,7 +9,7 @@
 #include <algorithm>
 #include <vector>
 
-#include "citymania/zoning.hpp"
+#include "citymania/highlight.hpp"
 
 
 Zoning _zoning = {CHECKNOTHING, CHECKNOTHING};