diff --git a/mopidy/utils/settings.py b/mopidy/utils/settings.py
index d369fa44..aa6dd3ae 100644
--- a/mopidy/utils/settings.py
+++ b/mopidy/utils/settings.py
@@ -117,9 +117,9 @@ def validate_settings(defaults, settings):
         'DUMP_LOG_FILENAME': 'DEBUG_LOG_FILENAME',
         'DUMP_LOG_FORMAT': 'DEBUG_LOG_FORMAT',
         'FRONTEND': 'FRONTENDS',
-        'GSTREAMER_AUDIO_SINK': 'CUSTOM_OUTPUT',
+        'GSTREAMER_AUDIO_SINK': 'OUTPUT',
         'LOCAL_MUSIC_FOLDER': 'LOCAL_MUSIC_PATH',
-        'LOCAL_OUTPUT_OVERRIDE': 'CUSTOM_OUTPUT',
+        'LOCAL_OUTPUT_OVERRIDE': 'OUTPUT',
         'LOCAL_PLAYLIST_FOLDER': 'LOCAL_PLAYLIST_PATH',
         'LOCAL_TAG_CACHE': 'LOCAL_TAG_CACHE_FILE',
         'SERVER': None,