diff --git a/Emby.Server.Implementations/ConfigurationOptions.cs b/Emby.Server.Implementations/ConfigurationOptions.cs
index a55a9eb2d..2ea7ff6e9 100644
--- a/Emby.Server.Implementations/ConfigurationOptions.cs
+++ b/Emby.Server.Implementations/ConfigurationOptions.cs
@@ -7,8 +7,8 @@ namespace Emby.Server.Implementations
     {
         public static Dictionary<string, string> Configuration => new Dictionary<string, string>
         {
-            { "HttpListenerHost_DefaultRedirectPath", "web/index.html" },
-            { "MusicBrainz_BaseUrl", "https://www.musicbrainz.org" },
+            { "HttpListenerHost:DefaultRedirectPath", "web/index.html" },
+            { "MusicBrainz:BaseUrl", "https://www.musicbrainz.org" },
             { FfmpegProbeSizeKey, "1G" },
             { FfmpegAnalyzeDurationKey, "200M" }
         };
diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index b77c53d87..2aefc9fe5 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -57,7 +57,7 @@ namespace Emby.Server.Implementations.HttpServer
             _appHost = applicationHost;
             _logger = logger;
             _config = config;
-            _defaultRedirectPath = configuration["HttpListenerHost_DefaultRedirectPath"];
+            _defaultRedirectPath = configuration["HttpListenerHost:DefaultRedirectPath"];
             _baseUrlPrefix = _config.Configuration.BaseUrl;
             _networkManager = networkManager;
             _jsonSerializer = jsonSerializer;
diff --git a/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs b/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
index 4048207bd..7ab62b262 100644
--- a/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
+++ b/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
@@ -10,12 +10,12 @@ namespace MediaBrowser.Controller.Extensions
         /// <summary>
         /// The key for the FFmpeg probe size option.
         /// </summary>
-        public const string FfmpegProbeSizeKey = "FFmpeg_probesize";
+        public const string FfmpegProbeSizeKey = "FFmpeg:probesize";
 
         /// <summary>
         /// The key for the FFmpeg analyse duration option.
         /// </summary>
-        public const string FfmpegAnalyzeDurationKey = "FFmpeg_analyzeduration";
+        public const string FfmpegAnalyzeDurationKey = "FFmpeg:analyzeduration";
 
         /// <summary>
         /// Retrieves the FFmpeg probe size from the <see cref="IConfiguration" />.
diff --git a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs b/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
index e9ca7938e..8e71b625e 100644
--- a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
+++ b/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
@@ -57,7 +57,7 @@ namespace MediaBrowser.Providers.Music
             _appHost = appHost;
             _logger = logger;
 
-            _musicBrainzBaseUrl = configuration["MusicBrainz_BaseUrl"];
+            _musicBrainzBaseUrl = configuration["MusicBrainz:BaseUrl"];
 
             // Use a stopwatch to ensure we don't exceed the MusicBrainz rate limit
             _stopWatchMusicBrainz.Start();