diff --git a/src/RealTime/Core/RealTimeCore.cs b/src/RealTime/Core/RealTimeCore.cs
index a5eb576996c863307742dbf1606a11141b0c17a5..c0a5e7aacbb91661f8e46447ce6d8337877df204 100644
--- a/src/RealTime/Core/RealTimeCore.cs
+++ b/src/RealTime/Core/RealTimeCore.cs
@@ -192,11 +192,11 @@ namespace RealTime.Core
 
             SimulationHandler.Statistics = statistics;
 
-            if (appliedPatches.Contains(WorldInfoPanelPatches.UpdateBindings))
+            if (appliedPatches.Contains(WorldInfoPanelPatch.UpdateBindings))
             {
-                WorldInfoPanelPatches.CitizenInfoPanel = CustomCitizenInfoPanel.Enable(ResidentAIPatch.RealTimeAI, localizationProvider);
-                WorldInfoPanelPatches.VehicleInfoPanel = CustomVehicleInfoPanel.Enable(ResidentAIPatch.RealTimeAI, localizationProvider);
-                WorldInfoPanelPatches.CampusWorldInfoPanel = CustomCampusWorldInfoPanel.Enable(localizationProvider);
+                WorldInfoPanelPatch.CitizenInfoPanel = CustomCitizenInfoPanel.Enable(ResidentAIPatch.RealTimeAI, localizationProvider);
+                WorldInfoPanelPatch.VehicleInfoPanel = CustomVehicleInfoPanel.Enable(ResidentAIPatch.RealTimeAI, localizationProvider);
+                WorldInfoPanelPatch.CampusWorldInfoPanel = CustomCampusWorldInfoPanel.Enable(localizationProvider);
             }
 
             AwakeSleepSimulation.Install(configProvider.Configuration);
@@ -262,14 +262,14 @@ namespace RealTime.Core
 
             StorageBase.CurrentLevelStorage.GameSaving -= GameSaving;
 
-            WorldInfoPanelPatches.CitizenInfoPanel?.Disable();
-            WorldInfoPanelPatches.CitizenInfoPanel = null;
+            WorldInfoPanelPatch.CitizenInfoPanel?.Disable();
+            WorldInfoPanelPatch.CitizenInfoPanel = null;
 
-            WorldInfoPanelPatches.VehicleInfoPanel?.Disable();
-            WorldInfoPanelPatches.VehicleInfoPanel = null;
+            WorldInfoPanelPatch.VehicleInfoPanel?.Disable();
+            WorldInfoPanelPatch.VehicleInfoPanel = null;
 
-            WorldInfoPanelPatches.CampusWorldInfoPanel?.Disable();
-            WorldInfoPanelPatches.CampusWorldInfoPanel = null;
+            WorldInfoPanelPatch.CampusWorldInfoPanel?.Disable();
+            WorldInfoPanelPatch.CampusWorldInfoPanel = null;
 
             isEnabled = false;
         }
@@ -290,7 +290,7 @@ namespace RealTime.Core
             }
 
             timeBar.Translate(localizationProvider.CurrentCulture);
-            UIGraphPatches.Translate(localizationProvider.CurrentCulture);
+            UIGraphPatch.Translate(localizationProvider.CurrentCulture);
         }
 
         private static List<IPatch> GetMethodPatches(Compatibility compatibility)
@@ -310,10 +310,10 @@ namespace RealTime.Core
                 ResidentAIPatch.InstanceSimulationStep,
                 TouristAIPatch.Location,
                 TransferManagerPatch.AddOutgoingOffer,
-                WorldInfoPanelPatches.UpdateBindings,
-                UIGraphPatches.MinDataPoints,
-                UIGraphPatches.VisibleEndTime,
-                UIGraphPatches.BuildLabels,
+                WorldInfoPanelPatch.UpdateBindings,
+                UIGraphPatch.MinDataPoints,
+                UIGraphPatch.VisibleEndTime,
+                UIGraphPatch.BuildLabels,
                 WeatherManagerPatch.SimulationStepImpl,
                 ParkPatches.DistrictParkSimulation,
                 OutsideConnectionAIPatch.DummyTrafficProbability,
diff --git a/src/RealTime/GameConnection/Patches/UIGraphPatches.cs b/src/RealTime/GameConnection/Patches/UIGraphPatch.cs
similarity index 99%
rename from src/RealTime/GameConnection/Patches/UIGraphPatches.cs
rename to src/RealTime/GameConnection/Patches/UIGraphPatch.cs
index 17c7a08a1165c5d3e92cbc630246aec5bcc65b6a..8730d1112ce9b86512fecdb45fb223c5f0c600b1 100644
--- a/src/RealTime/GameConnection/Patches/UIGraphPatches.cs
+++ b/src/RealTime/GameConnection/Patches/UIGraphPatch.cs
@@ -1,4 +1,4 @@
-// <copyright file="UIGraphPatches.cs" company="dymanoid">
+// <copyright file="UIGraphPatch.cs" company="dymanoid">
 // Copyright (c) dymanoid. All rights reserved.
 // </copyright>
 
@@ -18,7 +18,7 @@ namespace RealTime.GameConnection.Patches
     /// <summary>
     /// A static class that provides the patch objects for the statistics graph.
     /// </summary>
-    internal static class UIGraphPatches
+    internal static class UIGraphPatch
     {
         private const int MinRangeInDays = 7;
         private const int MinPointsCount = 32;
diff --git a/src/RealTime/GameConnection/Patches/WorldInfoPanelPatches.cs b/src/RealTime/GameConnection/Patches/WorldInfoPanelPatch.cs
similarity index 95%
rename from src/RealTime/GameConnection/Patches/WorldInfoPanelPatches.cs
rename to src/RealTime/GameConnection/Patches/WorldInfoPanelPatch.cs
index 989ac6b565215c63b855266943a9b6fcc575a049..992ecb2a51f5e0ce2da72fa738ed68bd3bdd96de 100644
--- a/src/RealTime/GameConnection/Patches/WorldInfoPanelPatches.cs
+++ b/src/RealTime/GameConnection/Patches/WorldInfoPanelPatch.cs
@@ -1,4 +1,4 @@
-// <copyright file="WorldInfoPanelPatches.cs" company="dymanoid">
+// <copyright file="WorldInfoPanelPatch.cs" company="dymanoid">
 // Copyright (c) dymanoid. All rights reserved.
 // </copyright>
 
@@ -12,7 +12,7 @@ namespace RealTime.GameConnection.Patches
     /// <summary>
     /// A static class that provides the patch objects for the world info panel game methods.
     /// </summary>
-    internal static class WorldInfoPanelPatches
+    internal static class WorldInfoPanelPatch
     {
         /// <summary>Gets or sets the customized citizen information panel.</summary>
         public static CustomCitizenInfoPanel CitizenInfoPanel { get; set; }
diff --git a/src/RealTime/RealTime.csproj b/src/RealTime/RealTime.csproj
index d1c1a2b7a76c0384835fed88dde1b0ffe6ccbbe1..e2ef04151336b04e933d4cf26025ac630305c13b 100644
--- a/src/RealTime/RealTime.csproj
+++ b/src/RealTime/RealTime.csproj
@@ -119,9 +119,9 @@
     <Compile Include="GameConnection\Patches\OutsideConnectionAIPatch.cs" />
     <Compile Include="GameConnection\Patches\ParkPatches.cs" />
     <Compile Include="GameConnection\Patches\TransferManagerPatch.cs" />
-    <Compile Include="GameConnection\Patches\UIGraphPatches.cs" />
+    <Compile Include="GameConnection\Patches\UIGraphPatch.cs" />
     <Compile Include="GameConnection\Patches\WeatherManagerPatch.cs" />
-    <Compile Include="GameConnection\Patches\WorldInfoPanelPatches.cs" />
+    <Compile Include="GameConnection\Patches\WorldInfoPanelPatch.cs" />
     <Compile Include="GameConnection\TouristAIConnection.cs" />
     <Compile Include="GameConnection\Patches\TouristAIPatch.cs" />
     <Compile Include="GameConnection\Patches\ResidentAIPatch.cs" />