diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncConnectionLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncConnectionLogic.cs
index fca61bfc6b..259dd6dde8 100644
--- a/OpenRA.Mods.Cnc/Widgets/Logic/CncConnectionLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncConnectionLogic.cs
@@ -14,7 +14,7 @@ using OpenRA.Widgets;
 
 namespace OpenRA.Mods.Cnc.Widgets.Logic
 {
-	public class CncConnectingLogic
+	public class CncConnectionLogic
 	{
 		Action onConnect, onRetry, onAbort;
 		string host;
@@ -48,7 +48,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 		}
 
 		[ObjectCreator.UseCtor]
-		public CncConnectingLogic(Widget widget, string host, int port, Action onConnect, Action onRetry, Action onAbort)
+		public CncConnectionLogic(Widget widget, string host, int port, Action onConnect, Action onRetry, Action onAbort)
 		{
 			this.host = host;
 			this.port = port;
diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncDirectConnectLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncDirectConnectLogic.cs
index f46afed61d..99f6e09099 100644
--- a/OpenRA.Mods.Cnc/Widgets/Logic/CncDirectConnectLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncDirectConnectLogic.cs
@@ -34,7 +34,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 				Game.Settings.Save();
 
 				Widget.CloseWindow();
-				CncConnectingLogic.Connect(ipField.Text, port, openLobby, onExit);
+				CncConnectionLogic.Connect(ipField.Text, port, openLobby, onExit);
 			};
 
 			panel.GetWidget<ButtonWidget>("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); };
diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncLobbyLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncLobbyLogic.cs
index 03f856f050..0848b86716 100644
--- a/OpenRA.Mods.Cnc/Widgets/Logic/CncLobbyLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncLobbyLogic.cs
@@ -59,7 +59,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 				Action onRetry = () =>
 				{
 					CloseWindow();
-					CncConnectingLogic.Connect(om.Host, om.Port, onConnect, onExit);
+					CncConnectionLogic.Connect(om.Host, om.Port, onConnect, onExit);
 				};
 
 				Widget.OpenWindow("CONNECTIONFAILED_PANEL", new WidgetArgs()
diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs
index cb2cf4ed53..09af6597ca 100644
--- a/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs
@@ -142,7 +142,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 		{
 			var map = WidgetUtils.ChooseInitialMap(Game.Settings.Server.Map);
 
-			CncConnectingLogic.Connect(IPAddress.Loopback.ToString(),
+			CncConnectionLogic.Connect(IPAddress.Loopback.ToString(),
 									   Game.CreateLocalServer(map),
 									   () => OpenLobbyPanel(MenuType.Main, true),
 									   () => { Game.CloseServer(); Menu = MenuType.Main; });
diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncServerBrowserLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncServerBrowserLogic.cs
index 4ce8fced52..ddbaf23b71 100644
--- a/OpenRA.Mods.Cnc/Widgets/Logic/CncServerBrowserLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncServerBrowserLogic.cs
@@ -68,7 +68,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 				var port = int.Parse(currentServer.Address.Split(':')[1]);
 
 				Widget.CloseWindow();
-				CncConnectingLogic.Connect(host, port, openLobby, onExit);
+				CncConnectionLogic.Connect(host, port, openLobby, onExit);
 			};
 
 			panel.GetWidget<ButtonWidget>("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); };
diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncServerCreationLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncServerCreationLogic.cs
index 3fa7738105..7b913392c1 100644
--- a/OpenRA.Mods.Cnc/Widgets/Logic/CncServerCreationLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncServerCreationLogic.cs
@@ -90,7 +90,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 			// Create and join the server
 			Game.CreateServer(settings);
 			Widget.CloseWindow();
-			CncConnectingLogic.Connect(IPAddress.Loopback.ToString(), Game.Settings.Server.ListenPort, onCreate, onExit);
+			CncConnectionLogic.Connect(IPAddress.Loopback.ToString(), Game.Settings.Server.ListenPort, onCreate, onExit);
 		}
 	}
 }
diff --git a/mods/cnc/chrome/connection.yaml b/mods/cnc/chrome/connection.yaml
index 50ca617f58..d88bd15f02 100644
--- a/mods/cnc/chrome/connection.yaml
+++ b/mods/cnc/chrome/connection.yaml
@@ -1,6 +1,6 @@
 Container@CONNECTING_PANEL:
 	Id:CONNECTING_PANEL
-	Logic:CncConnectingLogic
+	Logic:CncConnectionLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 90)/2
 	Width:370