diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 492a7640cc..33fa3179dd 100644
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -212,7 +212,6 @@
     <Compile Include="Widgets\SliderWidget.cs" />
     <Compile Include="Widgets\TextFieldWidget.cs" />
     <Compile Include="Widgets\TimerWidget.cs" />
-    <Compile Include="Widgets\ViewportScrollControllerWidget.cs" />
     <Compile Include="Widgets\VqaPlayerWidget.cs" />
     <Compile Include="Widgets\Widget.cs" />
     <Compile Include="Widgets\WidgetLoader.cs" />
@@ -237,6 +236,7 @@
     <Compile Include="Graphics\TextRenderable.cs" />
     <Compile Include="Graphics\BeamRenderable.cs" />
     <Compile Include="Graphics\ContrailRenderable.cs" />
+    <Compile Include="Widgets\ViewportControllerWidget.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
diff --git a/OpenRA.Game/Widgets/ViewportScrollControllerWidget.cs b/OpenRA.Game/Widgets/ViewportControllerWidget.cs
similarity index 98%
rename from OpenRA.Game/Widgets/ViewportScrollControllerWidget.cs
rename to OpenRA.Game/Widgets/ViewportControllerWidget.cs
index 03f3fe6ce3..8df15746ed 100755
--- a/OpenRA.Game/Widgets/ViewportScrollControllerWidget.cs
+++ b/OpenRA.Game/Widgets/ViewportControllerWidget.cs
@@ -15,7 +15,7 @@ using OpenRA.Graphics;
 
 namespace OpenRA.Widgets
 {
-	public class ViewportScrollControllerWidget : Widget
+	public class ViewportControllerWidget : Widget
 	{
 		public int EdgeScrollThreshold = 15;
 		public int EdgeCornerScrollThreshold = 35;
diff --git a/OpenRA.Mods.Cnc/Widgets/CncWorldInteractionControllerWidget.cs b/OpenRA.Mods.Cnc/Widgets/CncWorldInteractionControllerWidget.cs
index c8485a1379..67e787bc26 100644
--- a/OpenRA.Mods.Cnc/Widgets/CncWorldInteractionControllerWidget.cs
+++ b/OpenRA.Mods.Cnc/Widgets/CncWorldInteractionControllerWidget.cs
@@ -96,7 +96,7 @@ namespace OpenRA.Mods.Cnc.Widgets
 
 		public override string GetCursor(int2 pos)
 		{
-			return ViewportScrollControllerWidget.GetScrollCursor(this, Edge, pos)
+			return ViewportControllerWidget.GetScrollCursor(this, Edge, pos)
 				?? base.GetCursor(pos);
 		}
 
diff --git a/mods/ra/chrome/ingame.yaml b/mods/ra/chrome/ingame.yaml
index 52a556b481..da283abe41 100644
--- a/mods/ra/chrome/ingame.yaml
+++ b/mods/ra/chrome/ingame.yaml
@@ -6,7 +6,7 @@ Container@INGAME_ROOT:
 			Y:0
 			Width:WINDOW_RIGHT
 			Height:WINDOW_BOTTOM
-		ViewportScrollController:
+		ViewportController:
 			X:0
 			Y:0
 			Width:WINDOW_RIGHT