diff --git a/obs/data/locale/en-US.ini b/obs/data/locale/en-US.ini
index ea7417a11..090dee777 100644
--- a/obs/data/locale/en-US.ini
+++ b/obs/data/locale/en-US.ini
@@ -227,7 +227,7 @@ Basic.Settings.Output.RetryDelay="Retry Delay (seconds)"
 Basic.Settings.Output.MaxRetries="Maximum Retries"
 Basic.Settings.Output.Advanced="Enable Advanced Encoder Settings"
 Basic.Settings.Output.X264Preset="x264 Preset"
-Basic.Settings.Output.CustomX264Settings="Custom x264 Settings"
+Basic.Settings.Output.CustomEncoderSettings="Custom Encoder Settings"
 Basic.Settings.Output.UseCBR="Use Constant Bitrate"
 
 # basic mode 'video' settings
diff --git a/obs/forms/OBSBasicSettings.ui b/obs/forms/OBSBasicSettings.ui
index 9afe74465..b5738bb53 100644
--- a/obs/forms/OBSBasicSettings.ui
+++ b/obs/forms/OBSBasicSettings.ui
@@ -525,12 +525,12 @@
                     </widget>
                    </item>
                    <item row="9" column="1">
-                    <widget class="QLineEdit" name="simpleOutCustomX264"/>
+                    <widget class="QLineEdit" name="simpleOutCustom"/>
                    </item>
                    <item row="9" column="0">
                     <widget class="QLabel" name="label_23">
                      <property name="text">
-                      <string>Basic.Settings.Output.CustomX264Settings</string>
+                      <string>Basic.Settings.Output.CustomEncoderSettings</string>
                      </property>
                     </widget>
                    </item>
@@ -1222,7 +1222,7 @@
   <connection>
    <sender>simpleOutAdvanced</sender>
    <signal>toggled(bool)</signal>
-   <receiver>simpleOutCustomX264</receiver>
+   <receiver>simpleOutCustom</receiver>
    <slot>setVisible(bool)</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/obs/window-basic-settings.cpp b/obs/window-basic-settings.cpp
index c739dc442..afa9b42e9 100644
--- a/obs/window-basic-settings.cpp
+++ b/obs/window-basic-settings.cpp
@@ -148,7 +148,7 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
 	HookWidget(ui->simpleOutAdvanced,    CHECK_CHANGED,  OUTPUTS_CHANGED);
 	HookWidget(ui->simpleOutUseCBR,      CHECK_CHANGED,  OUTPUTS_CHANGED);
 	HookWidget(ui->simpleOutPreset,      COMBO_CHANGED,  OUTPUTS_CHANGED);
-	HookWidget(ui->simpleOutCustomX264,  EDIT_CHANGED,   OUTPUTS_CHANGED);
+	HookWidget(ui->simpleOutCustom,      EDIT_CHANGED,   OUTPUTS_CHANGED);
 	HookWidget(ui->channelSetup,         COMBO_CHANGED,  AUDIO_RESTART);
 	HookWidget(ui->sampleRate,           COMBO_CHANGED,  AUDIO_RESTART);
 	HookWidget(ui->desktopAudioDevice1,  COMBO_CHANGED,  AUDIO_CHANGED);
@@ -478,7 +478,7 @@ void OBSBasicSettings::LoadSimpleOutputSettings()
 	ui->simpleOutAdvanced->setChecked(advanced);
 	ui->simpleOutUseCBR->setChecked(useCBR);
 	ui->simpleOutPreset->setCurrentText(preset);
-	ui->simpleOutCustomX264->setText(custom);
+	ui->simpleOutCustom->setText(custom);
 }
 
 void OBSBasicSettings::LoadOutputSettings()
@@ -655,7 +655,7 @@ void OBSBasicSettings::SaveOutputSettings()
 	SaveCheckBox(ui->simpleOutAdvanced, "SimpleOutput", "UseAdvanced");
 	SaveCheckBox(ui->simpleOutUseCBR, "SimpleOutput", "UseCBR");
 	SaveCombo(ui->simpleOutPreset, "SimpleOutput", "Preset");
-	SaveEdit(ui->simpleOutCustomX264, "SimpleOutput", "x264Settings");
+	SaveEdit(ui->simpleOutCustom, "SimpleOutput", "x264Settings");
 }
 
 void OBSBasicSettings::SaveAudioSettings()