diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp
index fd2c2539c8..ab16b8f5ba 100644
--- a/src/openrct2-ui/windows/Multiplayer.cpp
+++ b/src/openrct2-ui/windows/Multiplayer.cpp
@@ -958,15 +958,15 @@ static void WindowMultiplayerOptionsMouseup(rct_window* w, WidgetIndex widgetInd
             }
             break;
         case WIDX_LOG_CHAT_CHECKBOX:
-            gConfigNetwork.log_chat = !gConfigNetwork.log_chat;
+            gConfigNetwork.LogChat = !gConfigNetwork.LogChat;
             config_save_default();
             break;
         case WIDX_LOG_SERVER_ACTIONS_CHECKBOX:
-            gConfigNetwork.log_server_actions = !gConfigNetwork.log_server_actions;
+            gConfigNetwork.LogServerActions = !gConfigNetwork.LogServerActions;
             config_save_default();
             break;
         case WIDX_KNOWN_KEYS_ONLY_CHECKBOX:
-            gConfigNetwork.known_keys_only = !gConfigNetwork.known_keys_only;
+            gConfigNetwork.KnownKeysOnly = !gConfigNetwork.KnownKeysOnly;
             config_save_default();
             break;
     }
@@ -994,9 +994,9 @@ static void WindowMultiplayerOptionsInvalidate(rct_window* w)
         w->widgets[WIDX_KNOWN_KEYS_ONLY_CHECKBOX].type = WindowWidgetType::Empty;
     }
 
-    WidgetSetCheckboxValue(*w, WIDX_LOG_CHAT_CHECKBOX, gConfigNetwork.log_chat);
-    WidgetSetCheckboxValue(*w, WIDX_LOG_SERVER_ACTIONS_CHECKBOX, gConfigNetwork.log_server_actions);
-    WidgetSetCheckboxValue(*w, WIDX_KNOWN_KEYS_ONLY_CHECKBOX, gConfigNetwork.known_keys_only);
+    WidgetSetCheckboxValue(*w, WIDX_LOG_CHAT_CHECKBOX, gConfigNetwork.LogChat);
+    WidgetSetCheckboxValue(*w, WIDX_LOG_SERVER_ACTIONS_CHECKBOX, gConfigNetwork.LogServerActions);
+    WidgetSetCheckboxValue(*w, WIDX_KNOWN_KEYS_ONLY_CHECKBOX, gConfigNetwork.KnownKeysOnly);
 }
 
 static void WindowMultiplayerOptionsPaint(rct_window* w, rct_drawpixelinfo* dpi)
diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp
index 94704a2534..8d2a205b90 100644
--- a/src/openrct2-ui/windows/Options.cpp
+++ b/src/openrct2-ui/windows/Options.cpp
@@ -1879,7 +1879,7 @@ private:
                 Invalidate();
                 break;
             case WIDX_STAY_CONNECTED_AFTER_DESYNC:
-                gConfigNetwork.stay_connected = !gConfigNetwork.stay_connected;
+                gConfigNetwork.StayConnected = !gConfigNetwork.StayConnected;
                 config_save_default();
                 Invalidate();
                 break;
@@ -1992,7 +1992,7 @@ private:
     {
         SetCheckboxValue(WIDX_DEBUGGING_TOOLS, gConfigGeneral.DebuggingTools);
         SetCheckboxValue(WIDX_SAVE_PLUGIN_DATA_CHECKBOX, gConfigGeneral.SavePluginData);
-        SetCheckboxValue(WIDX_STAY_CONNECTED_AFTER_DESYNC, gConfigNetwork.stay_connected);
+        SetCheckboxValue(WIDX_STAY_CONNECTED_AFTER_DESYNC, gConfigNetwork.StayConnected);
         SetCheckboxValue(WIDX_ALWAYS_NATIVE_LOADSAVE, gConfigGeneral.UseNativeBrowseDialog);
         widgets[WIDX_AUTOSAVE_FREQUENCY].text = AutosaveNames[gConfigGeneral.AutosaveFrequency];
     }
diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp
index 65fd96d821..2a805f03ba 100644
--- a/src/openrct2-ui/windows/ServerList.cpp
+++ b/src/openrct2-ui/windows/ServerList.cpp
@@ -144,7 +144,7 @@ rct_window* WindowServerListOpen()
 
     window_set_resize(*window, WWIDTH_MIN, WHEIGHT_MIN, WWIDTH_MAX, WHEIGHT_MAX);
 
-    safe_strcpy(_playerName, gConfigNetwork.player_name.c_str(), sizeof(_playerName));
+    safe_strcpy(_playerName, gConfigNetwork.PlayerName.c_str(), sizeof(_playerName));
 
     window->no_list_items = static_cast<uint16_t>(_serverList.GetCount());
 
@@ -322,7 +322,7 @@ static void WindowServerListTextinput(rct_window* w, WidgetIndex widgetIndex, ch
 
             if (_playerName[0] != '\0')
             {
-                gConfigNetwork.player_name = _playerName;
+                gConfigNetwork.PlayerName = _playerName;
                 config_save_default();
             }
 
diff --git a/src/openrct2-ui/windows/ServerStart.cpp b/src/openrct2-ui/windows/ServerStart.cpp
index b0d98d5fa9..b8573cdb3a 100644
--- a/src/openrct2-ui/windows/ServerStart.cpp
+++ b/src/openrct2-ui/windows/ServerStart.cpp
@@ -84,10 +84,10 @@ public:
         page = 0;
         list_information_type = 0;
 
-        snprintf(_port, 7, "%u", gConfigNetwork.default_port);
-        safe_strcpy(_name, gConfigNetwork.server_name.c_str(), sizeof(_name));
-        safe_strcpy(_description, gConfigNetwork.server_description.c_str(), sizeof(_description));
-        safe_strcpy(_greeting, gConfigNetwork.server_greeting.c_str(), sizeof(_greeting));
+        snprintf(_port, 7, "%u", gConfigNetwork.DefaultPort);
+        safe_strcpy(_name, gConfigNetwork.ServerName.c_str(), sizeof(_name));
+        safe_strcpy(_description, gConfigNetwork.ServerDescription.c_str(), sizeof(_description));
+        safe_strcpy(_greeting, gConfigNetwork.ServerGreeting.c_str(), sizeof(_greeting));
     }
     void OnMouseUp(WidgetIndex widgetIndex) override
     {
@@ -112,23 +112,23 @@ public:
                 window_start_textbox(*this, widgetIndex, STR_STRING, _password, 32);
                 break;
             case WIDX_MAXPLAYERS_INCREASE:
-                if (gConfigNetwork.maxplayers < 255)
+                if (gConfigNetwork.Maxplayers < 255)
                 {
-                    gConfigNetwork.maxplayers++;
+                    gConfigNetwork.Maxplayers++;
                 }
                 config_save_default();
                 Invalidate();
                 break;
             case WIDX_MAXPLAYERS_DECREASE:
-                if (gConfigNetwork.maxplayers > 1)
+                if (gConfigNetwork.Maxplayers > 1)
                 {
-                    gConfigNetwork.maxplayers--;
+                    gConfigNetwork.Maxplayers--;
                 }
                 config_save_default();
                 Invalidate();
                 break;
             case WIDX_ADVERTISE_CHECKBOX:
-                gConfigNetwork.advertise = !gConfigNetwork.advertise;
+                gConfigNetwork.Advertise = !gConfigNetwork.Advertise;
                 config_save_default();
                 Invalidate();
                 break;
@@ -149,10 +149,10 @@ public:
     {
         ColourSchemeUpdateByClass(this, WindowClass::ServerList);
 
-        WidgetSetCheckboxValue(*this, WIDX_ADVERTISE_CHECKBOX, gConfigNetwork.advertise);
+        WidgetSetCheckboxValue(*this, WIDX_ADVERTISE_CHECKBOX, gConfigNetwork.Advertise);
         auto ft = Formatter::Common();
         ft.Increment(18);
-        ft.Add<uint16_t>(gConfigNetwork.maxplayers);
+        ft.Add<uint16_t>(gConfigNetwork.Maxplayers);
     }
     void OnUpdate() override
     {
@@ -184,7 +184,7 @@ public:
                     safe_strcpy(_port, temp.c_str(), sizeof(_port));
                 }
 
-                gConfigNetwork.default_port = atoi(_port);
+                gConfigNetwork.DefaultPort = atoi(_port);
                 config_save_default();
 
                 widget_invalidate(*this, WIDX_NAME_INPUT);
@@ -201,7 +201,7 @@ public:
 
                 if (_name[0] != '\0')
                 {
-                    gConfigNetwork.server_name = _name;
+                    gConfigNetwork.ServerName = _name;
                     config_save_default();
                 }
 
@@ -219,7 +219,7 @@ public:
 
                 if (_description[0] != '\0')
                 {
-                    gConfigNetwork.server_description = _description;
+                    gConfigNetwork.ServerDescription = _description;
                     config_save_default();
                 }
 
@@ -237,7 +237,7 @@ public:
 
                 if (_greeting[0] != '\0')
                 {
-                    gConfigNetwork.server_greeting = _greeting;
+                    gConfigNetwork.ServerGreeting = _greeting;
                     config_save_default();
                 }
 
@@ -284,7 +284,7 @@ private:
         game_notify_map_change();
         if (GetContext()->LoadParkFromFile(path, false, true))
         {
-            network_begin_server(gConfigNetwork.default_port, gConfigNetwork.listen_address);
+            network_begin_server(gConfigNetwork.DefaultPort, gConfigNetwork.ListenAddress);
         }
     }
 
@@ -294,7 +294,7 @@ private:
         {
             game_notify_map_change();
             GetContext()->LoadParkFromFile(path);
-            network_begin_server(gConfigNetwork.default_port, gConfigNetwork.listen_address);
+            network_begin_server(gConfigNetwork.DefaultPort, gConfigNetwork.ListenAddress);
         }
     }
 };
diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp
index 1d406cbbaf..44edbb29d8 100644
--- a/src/openrct2/Context.cpp
+++ b/src/openrct2/Context.cpp
@@ -936,17 +936,17 @@ namespace OpenRCT2
                     {
                         if (gNetworkStartPort == 0)
                         {
-                            gNetworkStartPort = gConfigNetwork.default_port;
+                            gNetworkStartPort = gConfigNetwork.DefaultPort;
                         }
 
                         if (gNetworkStartAddress.empty())
                         {
-                            gNetworkStartAddress = gConfigNetwork.listen_address;
+                            gNetworkStartAddress = gConfigNetwork.ListenAddress;
                         }
 
                         if (gCustomPassword.empty())
                         {
-                            _network.SetPassword(gConfigNetwork.default_password.c_str());
+                            _network.SetPassword(gConfigNetwork.DefaultPassword.c_str());
                         }
                         else
                         {
@@ -981,7 +981,7 @@ namespace OpenRCT2
             {
                 if (gNetworkStartPort == 0)
                 {
-                    gNetworkStartPort = gConfigNetwork.default_port;
+                    gNetworkStartPort = gConfigNetwork.DefaultPort;
                 }
                 _network.BeginClient(gNetworkStartHost, gNetworkStartPort);
             }
diff --git a/src/openrct2/GameState.cpp b/src/openrct2/GameState.cpp
index 77f0d31774..29b7caf678 100644
--- a/src/openrct2/GameState.cpp
+++ b/src/openrct2/GameState.cpp
@@ -141,7 +141,7 @@ void GameState::Tick()
     }
 
     bool isPaused = game_is_paused();
-    if (network_get_mode() == NETWORK_MODE_SERVER && gConfigNetwork.pause_server_if_no_clients)
+    if (network_get_mode() == NETWORK_MODE_SERVER && gConfigNetwork.PauseServerIfNoClients)
     {
         // If we are headless we always have 1 player (host), pause if no one else is around.
         if (gOpenRCT2Headless && network_get_num_players() == 1)
diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp
index f14ff973a4..d8afc01780 100644
--- a/src/openrct2/config/Config.cpp
+++ b/src/openrct2/config/Config.cpp
@@ -407,26 +407,26 @@ namespace Config
             playerName = String::Trim(playerName);
 
             auto model = &gConfigNetwork;
-            model->player_name = std::move(playerName);
-            model->default_port = reader->GetInt32("default_port", NETWORK_DEFAULT_PORT);
-            model->listen_address = reader->GetString("listen_address", "");
-            model->default_password = reader->GetString("default_password", "");
-            model->stay_connected = reader->GetBoolean("stay_connected", true);
-            model->advertise = reader->GetBoolean("advertise", true);
-            model->advertise_address = reader->GetString("advertise_address", "");
-            model->maxplayers = reader->GetInt32("maxplayers", 16);
-            model->server_name = reader->GetString("server_name", "Server");
-            model->server_description = reader->GetString("server_description", "");
-            model->server_greeting = reader->GetString("server_greeting", "");
-            model->master_server_url = reader->GetString("master_server_url", "");
-            model->provider_name = reader->GetString("provider_name", "");
-            model->provider_email = reader->GetString("provider_email", "");
-            model->provider_website = reader->GetString("provider_website", "");
-            model->known_keys_only = reader->GetBoolean("known_keys_only", false);
-            model->log_chat = reader->GetBoolean("log_chat", false);
-            model->log_server_actions = reader->GetBoolean("log_server_actions", false);
-            model->pause_server_if_no_clients = reader->GetBoolean("pause_server_if_no_clients", false);
-            model->desync_debugging = reader->GetBoolean("desync_debugging", false);
+            model->PlayerName = std::move(playerName);
+            model->DefaultPort = reader->GetInt32("default_port", NETWORK_DEFAULT_PORT);
+            model->ListenAddress = reader->GetString("listen_address", "");
+            model->DefaultPassword = reader->GetString("default_password", "");
+            model->StayConnected = reader->GetBoolean("stay_connected", true);
+            model->Advertise = reader->GetBoolean("advertise", true);
+            model->AdvertiseAddress = reader->GetString("advertise_address", "");
+            model->Maxplayers = reader->GetInt32("maxplayers", 16);
+            model->ServerName = reader->GetString("server_name", "Server");
+            model->ServerDescription = reader->GetString("server_description", "");
+            model->ServerGreeting = reader->GetString("server_greeting", "");
+            model->MasterServerUrl = reader->GetString("master_server_url", "");
+            model->ProviderName = reader->GetString("provider_name", "");
+            model->ProviderEmail = reader->GetString("provider_email", "");
+            model->ProviderWebsite = reader->GetString("provider_website", "");
+            model->KnownKeysOnly = reader->GetBoolean("known_keys_only", false);
+            model->LogChat = reader->GetBoolean("log_chat", false);
+            model->LogServerActions = reader->GetBoolean("log_server_actions", false);
+            model->PauseServerIfNoClients = reader->GetBoolean("pause_server_if_no_clients", false);
+            model->DesyncDebugging = reader->GetBoolean("desync_debugging", false);
         }
     }
 
@@ -434,26 +434,26 @@ namespace Config
     {
         auto model = &gConfigNetwork;
         writer->WriteSection("network");
-        writer->WriteString("player_name", model->player_name);
-        writer->WriteInt32("default_port", model->default_port);
-        writer->WriteString("listen_address", model->listen_address);
-        writer->WriteString("default_password", model->default_password);
-        writer->WriteBoolean("stay_connected", model->stay_connected);
-        writer->WriteBoolean("advertise", model->advertise);
-        writer->WriteString("advertise_address", model->advertise_address);
-        writer->WriteInt32("maxplayers", model->maxplayers);
-        writer->WriteString("server_name", model->server_name);
-        writer->WriteString("server_description", model->server_description);
-        writer->WriteString("server_greeting", model->server_greeting);
-        writer->WriteString("master_server_url", model->master_server_url);
-        writer->WriteString("provider_name", model->provider_name);
-        writer->WriteString("provider_email", model->provider_email);
-        writer->WriteString("provider_website", model->provider_website);
-        writer->WriteBoolean("known_keys_only", model->known_keys_only);
-        writer->WriteBoolean("log_chat", model->log_chat);
-        writer->WriteBoolean("log_server_actions", model->log_server_actions);
-        writer->WriteBoolean("pause_server_if_no_clients", model->pause_server_if_no_clients);
-        writer->WriteBoolean("desync_debugging", model->desync_debugging);
+        writer->WriteString("player_name", model->PlayerName);
+        writer->WriteInt32("default_port", model->DefaultPort);
+        writer->WriteString("listen_address", model->ListenAddress);
+        writer->WriteString("default_password", model->DefaultPassword);
+        writer->WriteBoolean("stay_connected", model->StayConnected);
+        writer->WriteBoolean("advertise", model->Advertise);
+        writer->WriteString("advertise_address", model->AdvertiseAddress);
+        writer->WriteInt32("maxplayers", model->Maxplayers);
+        writer->WriteString("server_name", model->ServerName);
+        writer->WriteString("server_description", model->ServerDescription);
+        writer->WriteString("server_greeting", model->ServerGreeting);
+        writer->WriteString("master_server_url", model->MasterServerUrl);
+        writer->WriteString("provider_name", model->ProviderName);
+        writer->WriteString("provider_email", model->ProviderEmail);
+        writer->WriteString("provider_website", model->ProviderWebsite);
+        writer->WriteBoolean("known_keys_only", model->KnownKeysOnly);
+        writer->WriteBoolean("log_chat", model->LogChat);
+        writer->WriteBoolean("log_server_actions", model->LogServerActions);
+        writer->WriteBoolean("pause_server_if_no_clients", model->PauseServerIfNoClients);
+        writer->WriteBoolean("desync_debugging", model->DesyncDebugging);
     }
 
     static void ReadNotifications(IIniReader* reader)
diff --git a/src/openrct2/config/Config.h b/src/openrct2/config/Config.h
index ed4a6ac010..eb88130000 100644
--- a/src/openrct2/config/Config.h
+++ b/src/openrct2/config/Config.h
@@ -152,26 +152,26 @@ struct SoundConfiguration
 
 struct NetworkConfiguration
 {
-    std::string player_name;
-    int32_t default_port;
-    std::string listen_address;
-    std::string default_password;
-    bool stay_connected;
-    bool advertise;
-    std::string advertise_address;
-    int32_t maxplayers;
-    std::string server_name;
-    std::string server_description;
-    std::string server_greeting;
-    std::string master_server_url;
-    std::string provider_name;
-    std::string provider_email;
-    std::string provider_website;
-    bool known_keys_only;
-    bool log_chat;
-    bool log_server_actions;
-    bool pause_server_if_no_clients;
-    bool desync_debugging;
+    std::string PlayerName;
+    int32_t DefaultPort;
+    std::string ListenAddress;
+    std::string DefaultPassword;
+    bool StayConnected;
+    bool Advertise;
+    std::string AdvertiseAddress;
+    int32_t Maxplayers;
+    std::string ServerName;
+    std::string ServerDescription;
+    std::string ServerGreeting;
+    std::string MasterServerUrl;
+    std::string ProviderName;
+    std::string ProviderEmail;
+    std::string ProviderWebsite;
+    bool KnownKeysOnly;
+    bool LogChat;
+    bool LogServerActions;
+    bool PauseServerIfNoClients;
+    bool DesyncDebugging;
 };
 
 struct NotificationConfiguration
diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp
index 0e106de25d..ce842939da 100644
--- a/src/openrct2/network/NetworkBase.cpp
+++ b/src/openrct2/network/NetworkBase.cpp
@@ -282,7 +282,7 @@ bool NetworkBase::BeginClient(const std::string& host, uint16_t port)
     // risk of tick collision with the server map and title screen map.
     GameActions::SuspendQueue();
 
-    auto keyPath = network_get_private_key_path(gConfigNetwork.player_name);
+    auto keyPath = network_get_private_key_path(gConfigNetwork.PlayerName);
     if (!File::Exists(keyPath))
     {
         Console::WriteLine("Generating key... This may take a while");
@@ -310,7 +310,7 @@ bool NetworkBase::BeginClient(const std::string& host, uint16_t port)
 
         const std::string hash = _key.PublicKeyHash();
         const utf8* publicKeyHash = hash.c_str();
-        keyPath = network_get_public_key_path(gConfigNetwork.player_name, publicKeyHash);
+        keyPath = network_get_public_key_path(gConfigNetwork.PlayerName, publicKeyHash);
         Console::WriteLine("Key generated, saving public bits as %s", keyPath.c_str());
 
         try
@@ -372,12 +372,12 @@ bool NetworkBase::BeginServer(uint16_t port, const std::string& address)
         return false;
     }
 
-    ServerName = gConfigNetwork.server_name;
-    ServerDescription = gConfigNetwork.server_description;
-    ServerGreeting = gConfigNetwork.server_greeting;
-    ServerProviderName = gConfigNetwork.provider_name;
-    ServerProviderEmail = gConfigNetwork.provider_email;
-    ServerProviderWebsite = gConfigNetwork.provider_website;
+    ServerName = gConfigNetwork.ServerName;
+    ServerDescription = gConfigNetwork.ServerDescription;
+    ServerGreeting = gConfigNetwork.ServerGreeting;
+    ServerProviderName = gConfigNetwork.ProviderName;
+    ServerProviderEmail = gConfigNetwork.ProviderEmail;
+    ServerProviderWebsite = gConfigNetwork.ProviderWebsite;
 
     IsServerPlayerInvisible = gOpenRCT2Headless;
 
@@ -386,7 +386,7 @@ bool NetworkBase::BeginServer(uint16_t port, const std::string& address)
     BeginChatLog();
     BeginServerLog();
 
-    NetworkPlayer* player = AddPlayer(gConfigNetwork.player_name, "");
+    NetworkPlayer* player = AddPlayer(gConfigNetwork.PlayerName, "");
     player->Flags |= NETWORK_PLAYER_FLAG_ISSERVER;
     player->Group = 0;
     player_id = player->Id;
@@ -407,7 +407,7 @@ bool NetworkBase::BeginServer(uint16_t port, const std::string& address)
 
     status = NETWORK_STATUS_CONNECTED;
     listening_port = port;
-    _serverState.gamestateSnapshotsEnabled = gConfigNetwork.desync_debugging;
+    _serverState.gamestateSnapshotsEnabled = gConfigNetwork.DesyncDebugging;
     _advertiser = CreateServerAdvertiser(listening_port);
 
     game_load_scripts();
@@ -796,7 +796,7 @@ bool NetworkBase::CheckDesynchronizaton()
         intent.putExtra(INTENT_EXTRA_MESSAGE, std::string{ str_desync });
         context_open_intent(&intent);
 
-        if (!gConfigNetwork.stay_connected)
+        if (!gConfigNetwork.StayConnected)
         {
             Close();
         }
@@ -868,12 +868,12 @@ std::string NetworkBase::GenerateAdvertiseKey()
 
 std::string NetworkBase::GetMasterServerUrl()
 {
-    if (gConfigNetwork.master_server_url.empty())
+    if (gConfigNetwork.MasterServerUrl.empty())
     {
         return OPENRCT2_MASTER_SERVER_URL;
     }
 
-    return gConfigNetwork.master_server_url;
+    return gConfigNetwork.MasterServerUrl;
 }
 
 NetworkGroup* NetworkBase::AddGroup()
@@ -1111,7 +1111,7 @@ void NetworkBase::BeginChatLog()
 
 void NetworkBase::AppendChatLog(std::string_view s)
 {
-    if (gConfigNetwork.log_chat && _chat_log_fs.is_open())
+    if (gConfigNetwork.LogChat && _chat_log_fs.is_open())
     {
         AppendLog(_chat_log_fs, s);
     }
@@ -1149,7 +1149,7 @@ void NetworkBase::BeginServerLog()
 
 void NetworkBase::AppendServerLog(const std::string& s)
 {
-    if (gConfigNetwork.log_server_actions && _server_log_fs.is_open())
+    if (gConfigNetwork.LogServerActions && _server_log_fs.is_open())
     {
         AppendLog(_server_log_fs, s);
     }
@@ -1583,10 +1583,10 @@ void NetworkBase::Server_Send_SETDISCONNECTMSG(NetworkConnection& connection, co
 json_t NetworkBase::GetServerInfoAsJson() const
 {
     json_t jsonObj = {
-        { "name", gConfigNetwork.server_name },         { "requiresPassword", _password.size() > 0 },
-        { "version", network_get_version() },           { "players", GetNumVisiblePlayers() },
-        { "maxPlayers", gConfigNetwork.maxplayers },    { "description", gConfigNetwork.server_description },
-        { "greeting", gConfigNetwork.server_greeting }, { "dedicated", gOpenRCT2Headless },
+        { "name", gConfigNetwork.ServerName },         { "requiresPassword", _password.size() > 0 },
+        { "version", network_get_version() },          { "players", GetNumVisiblePlayers() },
+        { "maxPlayers", gConfigNetwork.Maxplayers },   { "description", gConfigNetwork.ServerDescription },
+        { "greeting", gConfigNetwork.ServerGreeting }, { "dedicated", gOpenRCT2Headless },
     };
     return jsonObj;
 }
@@ -1599,9 +1599,9 @@ void NetworkBase::Server_Send_GAMEINFO(NetworkConnection& connection)
 
     // Provider details
     json_t jsonProvider = {
-        { "name", gConfigNetwork.provider_name },
-        { "email", gConfigNetwork.provider_email },
-        { "website", gConfigNetwork.provider_website },
+        { "name", gConfigNetwork.ProviderName },
+        { "email", gConfigNetwork.ProviderEmail },
+        { "website", gConfigNetwork.ProviderWebsite },
     };
 
     jsonObj["provider"] = jsonProvider;
@@ -2119,7 +2119,7 @@ std::string NetworkBase::MakePlayerNameUnique(const std::string& name)
 
 void NetworkBase::Client_Handle_TOKEN(NetworkConnection& connection, NetworkPacket& packet)
 {
-    auto keyPath = network_get_private_key_path(gConfigNetwork.player_name);
+    auto keyPath = network_get_private_key_path(gConfigNetwork.PlayerName);
     if (!File::Exists(keyPath))
     {
         log_error("Key file (%s) was not found. Restart client to re-generate it.", keyPath.c_str());
@@ -2162,7 +2162,7 @@ void NetworkBase::Client_Handle_TOKEN(NetworkConnection& connection, NetworkPack
     // when process dump gets collected at some point in future.
     _key.Unload();
 
-    Client_Send_AUTH(gConfigNetwork.player_name, gCustomPassword, pubkey, signature);
+    Client_Send_AUTH(gConfigNetwork.PlayerName, gCustomPassword, pubkey, signature);
 }
 
 void NetworkBase::Server_Handle_REQUEST_GAMESTATE(NetworkConnection& connection, NetworkPacket& packet)
@@ -2561,7 +2561,7 @@ void NetworkBase::Server_Handle_AUTH(NetworkConnection& connection, NetworkPacke
                 if (verified)
                 {
                     log_verbose("Connection %s: Signature verification ok. Hash %s", hostName, hash.c_str());
-                    if (gConfigNetwork.known_keys_only && _userManager.GetUserByHash(hash) == nullptr)
+                    if (gConfigNetwork.KnownKeysOnly && _userManager.GetUserByHash(hash) == nullptr)
                     {
                         log_verbose("Connection %s: Hash %s, not known", hostName, hash.c_str());
                         connection.AuthStatus = NetworkAuth::UnknownKeyDisallowed;
@@ -2614,7 +2614,7 @@ void NetworkBase::Server_Handle_AUTH(NetworkConnection& connection, NetworkPacke
             }
         }
 
-        if (GetNumVisiblePlayers() >= gConfigNetwork.maxplayers)
+        if (GetNumVisiblePlayers() >= gConfigNetwork.Maxplayers)
         {
             connection.AuthStatus = NetworkAuth::Full;
             log_info("Connection %s: Server is full.", hostName);
@@ -3825,7 +3825,7 @@ void network_send_game_action(const GameAction* action)
 void network_send_password(const std::string& password)
 {
     auto& network = OpenRCT2::GetContext()->GetNetwork();
-    const auto keyPath = network_get_private_key_path(gConfigNetwork.player_name);
+    const auto keyPath = network_get_private_key_path(gConfigNetwork.PlayerName);
     if (!File::Exists(keyPath))
     {
         log_error("Private key %s missing! Restart the game to generate it.", keyPath.c_str());
@@ -3848,7 +3848,7 @@ void network_send_password(const std::string& password)
     // Don't keep private key in memory. There's no need and it may get leaked
     // when process dump gets collected at some point in future.
     network._key.Unload();
-    network.Client_Send_AUTH(gConfigNetwork.player_name, password, pubkey, signature);
+    network.Client_Send_AUTH(gConfigNetwork.PlayerName, password, pubkey, signature);
 }
 
 void network_set_password(const char* password)
diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp
index 85c1ebf686..1d822a0e6b 100644
--- a/src/openrct2/network/NetworkServerAdvertiser.cpp
+++ b/src/openrct2/network/NetworkServerAdvertiser.cpp
@@ -89,7 +89,7 @@ public:
     {
         UpdateLAN();
 #    ifndef DISABLE_HTTP
-        if (gConfigNetwork.advertise)
+        if (gConfigNetwork.Advertise)
         {
             UpdateWAN();
         }
@@ -179,9 +179,9 @@ private:
             { "port", _port },
         };
 
-        if (!gConfigNetwork.advertise_address.empty())
+        if (!gConfigNetwork.AdvertiseAddress.empty())
         {
-            body["address"] = gConfigNetwork.advertise_address;
+            body["address"] = gConfigNetwork.AdvertiseAddress;
         }
 
         request.body = body.dump();
@@ -335,9 +335,9 @@ private:
     static std::string GetMasterServerUrl()
     {
         std::string result = OPENRCT2_MASTER_SERVER_URL;
-        if (!gConfigNetwork.master_server_url.empty())
+        if (!gConfigNetwork.MasterServerUrl.empty())
         {
-            result = gConfigNetwork.master_server_url;
+            result = gConfigNetwork.MasterServerUrl;
         }
         return result;
     }
diff --git a/src/openrct2/network/ServerList.cpp b/src/openrct2/network/ServerList.cpp
index eaa727ac8c..c997807c4d 100644
--- a/src/openrct2/network/ServerList.cpp
+++ b/src/openrct2/network/ServerList.cpp
@@ -361,9 +361,9 @@ std::future<std::vector<ServerListEntry>> ServerList::FetchOnlineServerListAsync
     auto f = p->get_future();
 
     std::string masterServerUrl = OPENRCT2_MASTER_SERVER_URL;
-    if (!gConfigNetwork.master_server_url.empty())
+    if (!gConfigNetwork.MasterServerUrl.empty())
     {
-        masterServerUrl = gConfigNetwork.master_server_url;
+        masterServerUrl = gConfigNetwork.MasterServerUrl;
     }
 
     Http::Request request;