diff --git a/OpenRA.Game/Network/Session.cs b/OpenRA.Game/Network/Session.cs
index 718339d158..ffe8544fda 100644
--- a/OpenRA.Game/Network/Session.cs
+++ b/OpenRA.Game/Network/Session.cs
@@ -180,13 +180,11 @@ namespace OpenRA.Network
 
 		public class LobbyOptionState
 		{
-			public bool Locked;
 			public string Value;
 			public string PreferredValue;
 
-			public LobbyOptionState() { }
-
-			public bool Enabled { get { return Value == "True"; } }
+			public bool IsLocked;
+			public bool IsEnabled { get { return Value == "True"; } }
 		}
 
 		public class Global
@@ -228,7 +226,7 @@ namespace OpenRA.Network
 			{
 				LobbyOptionState option;
 				if (LobbyOptions.TryGetValue(id, out option))
-					return option.Enabled;
+					return option.IsEnabled;
 
 				return def;
 			}
diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs
index 83f034593d..83a24b357a 100644
--- a/OpenRA.Game/Traits/TraitsInterfaces.cs
+++ b/OpenRA.Game/Traits/TraitsInterfaces.cs
@@ -392,8 +392,8 @@ namespace OpenRA.Traits
 		public readonly string Description;
 		public readonly IReadOnlyDictionary<string, string> Values;
 		public readonly string DefaultValue;
-		public readonly bool Locked;
-		public readonly bool Visible;
+		public readonly bool IsLocked;
+		public readonly bool IsVisible;
 		public readonly int DisplayOrder;
 
 		public LobbyOption(string id, string name, string description, bool visible, int displayorder,
@@ -402,11 +402,11 @@ namespace OpenRA.Traits
 			Id = id;
 			Name = name;
 			Description = description;
-			Visible = visible;
+			IsVisible = visible;
 			DisplayOrder = displayorder;
 			Values = values;
 			DefaultValue = defaultValue;
-			Locked = locked;
+			IsLocked = locked;
 		}
 
 		public virtual string ValueChangedMessage(string playerName, string newValue)
diff --git a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
index 167318efb9..db62f70752 100644
--- a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
+++ b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
@@ -464,7 +464,7 @@ namespace OpenRA.Mods.Common.Server
 							return true;
 						}
 
-						if (option.Locked)
+						if (option.IsLocked)
 						{
 							server.SendOrderTo(conn, "Message", "{0} cannot be changed.".F(option.Name));
 							return true;
@@ -807,7 +807,7 @@ namespace OpenRA.Mods.Common.Server
 				if (gs.LobbyOptions.TryGetValue(o.Id, out state))
 				{
 					// Propagate old state on map change
-					if (!o.Locked)
+					if (!o.IsLocked)
 					{
 						if (o.Values.Keys.Contains(state.PreferredValue))
 							value = state.PreferredValue;
@@ -820,7 +820,7 @@ namespace OpenRA.Mods.Common.Server
 				else
 					state = new Session.LobbyOptionState();
 
-				state.Locked = o.Locked;
+				state.IsLocked = o.IsLocked;
 				state.Value = value;
 				state.PreferredValue = preferredValue;
 				gs.LobbyOptions[o.Id] = state;
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyOptionsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyOptionsLogic.cs
index bf3984fa8b..b062b0addd 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyOptionsLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyOptionsLogic.cs
@@ -79,7 +79,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			var allOptions = mapPreview.Rules.Actors["player"].TraitInfos<ILobbyOptions>()
 					.Concat(mapPreview.Rules.Actors["world"].TraitInfos<ILobbyOptions>())
 					.SelectMany(t => t.LobbyOptions(mapPreview.Rules))
-					.Where(o => o.Visible)
+					.Where(o => o.IsVisible)
 					.OrderBy(o => o.DisplayOrder)
 					.ToArray();
 
@@ -110,10 +110,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 					checkbox.GetTooltipText = () => option.Description;
 
 				checkbox.IsVisible = () => true;
-				checkbox.IsChecked = () => optionValue.Update(orderManager.LobbyInfo.GlobalSettings).Enabled;
-				checkbox.IsDisabled = () => configurationDisabled() || optionValue.Update(orderManager.LobbyInfo.GlobalSettings).Locked;
+				checkbox.IsChecked = () => optionValue.Update(orderManager.LobbyInfo.GlobalSettings).IsEnabled;
+				checkbox.IsDisabled = () => configurationDisabled() || optionValue.Update(orderManager.LobbyInfo.GlobalSettings).IsLocked;
 				checkbox.OnClick = () => orderManager.IssueOrder(Order.Command(
-					"option {0} {1}".F(option.Id, !optionValue.Update(orderManager.LobbyInfo.GlobalSettings).Enabled)));
+					"option {0} {1}".F(option.Id, !optionValue.Update(orderManager.LobbyInfo.GlobalSettings).IsEnabled)));
 			}
 
 			foreach (var option in allOptions.Where(o => !(o is LobbyBooleanOption)))
@@ -148,7 +148,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 					dropdown.GetTooltipText = () => option.Description;
 				dropdown.IsVisible = () => true;
 				dropdown.IsDisabled = () => configurationDisabled() ||
-					optionValue.Update(orderManager.LobbyInfo.GlobalSettings).Locked;
+					optionValue.Update(orderManager.LobbyInfo.GlobalSettings).IsLocked;
 
 				dropdown.OnMouseDown = _ =>
 				{