diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini
index 6ce0f0a..c7ed175 100644
--- a/data/locale/en-US.ini
+++ b/data/locale/en-US.ini
@@ -131,6 +131,47 @@ Encoder.AOM.AV1.Advanced.Tune.Content="Content"
 Encoder.AOM.AV1.Advanced.Tune.Content.Screen="Screen"
 Encoder.AOM.AV1.Advanced.Tune.Content.Film="Film"
 
+# Encoder/FFmpeg
+Encoder.FFmpeg="FFmpeg Options"
+Encoder.FFmpeg.Suffix=" (via FFmpeg)"
+Encoder.FFmpeg.CustomSettings="Custom Settings"
+Encoder.FFmpeg.Threads="Number of Threads"
+Encoder.FFmpeg.GPU="GPU"
+Encoder.FFmpeg.KeyFrames="Key Frames"
+Encoder.FFmpeg.KeyFrames.IntervalType="Interval Type"
+Encoder.FFmpeg.KeyFrames.IntervalType.Frames="Frames"
+Encoder.FFmpeg.KeyFrames.IntervalType.Seconds="Seconds"
+Encoder.FFmpeg.KeyFrames.Interval="Interval"
+
+# Encoder/FFmpeg/AMF
+Encoder.FFmpeg.AMF.Preset="Preset"
+Encoder.FFmpeg.AMF.Preset.Speed="Speed"
+Encoder.FFmpeg.AMF.Preset.Balanced="Balanced"
+Encoder.FFmpeg.AMF.Preset.Quality="Quality"
+Encoder.FFmpeg.AMF.RateControl="Rate Control Options"
+Encoder.FFmpeg.AMF.RateControl.Mode="Mode"
+Encoder.FFmpeg.AMF.RateControl.Mode.CQP="Constant Quantization Parameter"
+Encoder.FFmpeg.AMF.RateControl.Mode.VBR_PEAK="Variable Bitrate (Peak Constrained)"
+Encoder.FFmpeg.AMF.RateControl.Mode.VBR_LATENCY="Variable Bitrate (Latency Constrained)"
+Encoder.FFmpeg.AMF.RateControl.Mode.CBR="Constant Bitrate"
+Encoder.FFmpeg.AMF.RateControl.LookAhead="Look Ahead"
+Encoder.FFmpeg.AMF.RateControl.FrameSkipping="Frame Skipping"
+Encoder.FFmpeg.AMF.RateControl.Limits="Limits"
+Encoder.FFmpeg.AMF.RateControl.Limits.BufferSize="Buffer Size"
+Encoder.FFmpeg.AMF.RateControl.Limits.Bitrate.Target="Target Bitrate"
+Encoder.FFmpeg.AMF.RateControl.Limits.Bitrate.Maximum="Maximum Bitrate"
+Encoder.FFmpeg.AMF.RateControl.QP="Quantization Parameters"
+Encoder.FFmpeg.AMF.RateControl.QP.I="I-Frame QP"
+Encoder.FFmpeg.AMF.RateControl.QP.P="P-Frame QP"
+Encoder.FFmpeg.AMF.RateControl.QP.B="B-Frame QP"
+Encoder.FFmpeg.AMF.Other="Other Options"
+Encoder.FFmpeg.AMF.Other.BFrames="Maximum B-Frames"
+Encoder.FFmpeg.AMF.Other.BFrameReferences="B-Frame References"
+Encoder.FFmpeg.AMF.Other.ReferenceFrames="Reference Frames"
+Encoder.FFmpeg.AMF.Other.EnforceHRD="Enforce HRD"
+Encoder.FFmpeg.AMF.Other.VBAQ="VBAQ"
+Encoder.FFmpeg.AMF.Other.AccessUnitDelimiter="Access Unit Delimiter"
+
 # Encoder/FFmpeg/NVENC
 Encoder.FFmpeg.NVENC.Preset="Preset"
 Encoder.FFmpeg.NVENC.Preset.Default="Default"
@@ -458,47 +499,3 @@ Codec.ProRes.Profile.APCN="422 Standard (APCN)"
 Codec.ProRes.Profile.APCH="422 High Quality/HQ (APCH)"
 Codec.ProRes.Profile.AP4H="4444 High Quality/HQ (AP4H)"
 Codec.ProRes.Profile.AP4X="4444 Extreme Quality/XQ (AP4X)"
-
-# Encoder: FFmpeg
-FFmpegEncoder="FFmpeg Options"
-FFmpegEncoder.Suffix=" (via FFmpeg)"
-FFmpegEncoder.CustomSettings="Custom Settings"
-FFmpegEncoder.Threads="Number of Threads"
-FFmpegEncoder.GPU="GPU"
-FFmpegEncoder.KeyFrames="Key Frames"
-FFmpegEncoder.KeyFrames.IntervalType="Interval Type"
-FFmpegEncoder.KeyFrames.IntervalType.Frames="Frames"
-FFmpegEncoder.KeyFrames.IntervalType.Seconds="Seconds"
-FFmpegEncoder.KeyFrames.Interval="Interval"
-
-# Encoder: AMF
-FFmpegEncoder.AMF.Preset="Preset"
-FFmpegEncoder.AMF.Preset.Speed="Speed"
-FFmpegEncoder.AMF.Preset.Balanced="Balanced"
-FFmpegEncoder.AMF.Preset.Quality="Quality"
-FFmpegEncoder.AMF.RateControl="Rate Control Options"
-FFmpegEncoder.AMF.RateControl.Mode="Mode"
-FFmpegEncoder.AMF.RateControl.Mode.CQP="Constant Quantization Parameter"
-FFmpegEncoder.AMF.RateControl.Mode.VBR_PEAK="Variable Bitrate (Peak Constrained)"
-FFmpegEncoder.AMF.RateControl.Mode.VBR_LATENCY="Variable Bitrate (Latency Constrained)"
-FFmpegEncoder.AMF.RateControl.Mode.CBR="Constant Bitrate"
-FFmpegEncoder.AMF.RateControl.LookAhead="Look Ahead"
-FFmpegEncoder.AMF.RateControl.FrameSkipping="Frame Skipping"
-FFmpegEncoder.AMF.RateControl.Limits="Limits"
-FFmpegEncoder.AMF.RateControl.Limits.BufferSize="Buffer Size"
-FFmpegEncoder.AMF.RateControl.Limits.Bitrate.Target="Target Bitrate"
-FFmpegEncoder.AMF.RateControl.Limits.Bitrate.Maximum="Maximum Bitrate"
-FFmpegEncoder.AMF.RateControl.QP="Quantization Parameters"
-FFmpegEncoder.AMF.RateControl.QP.I="I-Frame QP"
-FFmpegEncoder.AMF.RateControl.QP.P="P-Frame QP"
-FFmpegEncoder.AMF.RateControl.QP.B="B-Frame QP"
-FFmpegEncoder.AMF.Other="Other Options"
-FFmpegEncoder.AMF.Other.BFrames="Maximum B-Frames"
-FFmpegEncoder.AMF.Other.BFrameReferences="B-Frame References"
-FFmpegEncoder.AMF.Other.ReferenceFrames="Reference Frames"
-FFmpegEncoder.AMF.Other.EnforceHRD="Enforce HRD"
-FFmpegEncoder.AMF.Other.VBAQ="VBAQ"
-FFmpegEncoder.AMF.Other.AccessUnitDelimiter="Access Unit Delimiter"
-
-# Encoder: NVENC
-
diff --git a/source/encoders/encoder-ffmpeg.cpp b/source/encoders/encoder-ffmpeg.cpp
index 0f9645c..024cd7f 100644
--- a/source/encoders/encoder-ffmpeg.cpp
+++ b/source/encoders/encoder-ffmpeg.cpp
@@ -59,7 +59,7 @@ extern "C" {
 #endif
 
 // FFmpeg
-#define ST_I18N_FFMPEG "FFmpegEncoder"
+#define ST_I18N_FFMPEG "Encoder.FFmpeg"
 #define ST_I18N_FFMPEG_SUFFIX ST_I18N_FFMPEG ".Suffix"
 #define ST_I18N_FFMPEG_CUSTOMSETTINGS ST_I18N_FFMPEG ".CustomSettings"
 #define ST_KEY_FFMPEG_CUSTOMSETTINGS "FFmpeg.CustomSettings"
diff --git a/source/encoders/handlers/amf_shared.cpp b/source/encoders/handlers/amf_shared.cpp
index 3420c16..52209ad 100644
--- a/source/encoders/handlers/amf_shared.cpp
+++ b/source/encoders/handlers/amf_shared.cpp
@@ -30,10 +30,10 @@ extern "C" {
 }
 
 // Translation
-#define ST_I18N "FFmpegEncoder.AMF"
+#define ST_I18N "Encoder.FFmpeg.AMF"
 #define ST_I18N_PRESET ST_I18N ".Preset"
 #define ST_I18N_PRESET_(x) ST_I18N_PRESET "." x
-#define ST_I18N_RATECONTROL "FFmpegEncoder.AMF.RateControl"
+#define ST_I18N_RATECONTROL "Encoder.FFmpeg.AMF.RateControl"
 #define ST_I18N_RATECONTROL_MODE ST_I18N_RATECONTROL ".Mode"
 #define ST_I18N_RATECONTROL_MODE_(x) ST_I18N_RATECONTROL_MODE "." x
 #define ST_I18N_RATECONTROL_LOOKAHEAD ST_I18N_RATECONTROL ".LookAhead"