diff --git a/src/common/useTranslate.js b/src/common/useTranslate.js
index 7214a4a1e..fdfb2f3fe 100644
--- a/src/common/useTranslate.js
+++ b/src/common/useTranslate.js
@@ -9,7 +9,7 @@ const useTranslate = () => {
     const string = useCallback((key) => t(key), [t]);
 
     const stringWithPrefix = useCallback((value, prefix, fallback = null) => {
-        const key = `${prefix}${value}`;
+        const key = `${prefix || ''}${value}`;
         const defaultValue = fallback ?? value.charAt(0).toUpperCase() + value.slice(1);
 
         return t(key, {
diff --git a/src/routes/Addons/useSelectableInputs.js b/src/routes/Addons/useSelectableInputs.js
index af0bb35fc..e9d276d71 100644
--- a/src/routes/Addons/useSelectableInputs.js
+++ b/src/routes/Addons/useSelectableInputs.js
@@ -10,8 +10,8 @@ const mapSelectableInputs = (installedAddons, remoteAddons, t) => {
             .concat(installedAddons.selectable.catalogs)
             .map(({ name, deepLinks }) => ({
                 value: deepLinks.addons,
-                label: t.stringWithPrefix(name, 'ADDON_'),
-                title: t.stringWithPrefix(name, 'ADDON_'),
+                label: t.stringWithPrefix(name.toUpperCase(), 'ADDON_'),
+                title: t.stringWithPrefix(name.toUpperCase(), 'ADDON_'),
             })),
         selected: remoteAddons.selectable.catalogs
             .concat(installedAddons.selectable.catalogs)
diff --git a/src/routes/Discover/useSelectableInputs.js b/src/routes/Discover/useSelectableInputs.js
index 18d317507..66178c7ee 100644
--- a/src/routes/Discover/useSelectableInputs.js
+++ b/src/routes/Discover/useSelectableInputs.js
@@ -46,7 +46,7 @@ const mapSelectableInputs = (discover, t) => {
         }
     };
     const extraSelects = discover.selectable.extra.map(({ name, isRequired, options }) => ({
-        title: t.stringWithPrefix(name, 'SELECT_'),
+        title: t.stringWithPrefix(name),
         isRequired: isRequired,
         options: options.map(({ value, deepLinks }) => ({
             label: typeof value === 'string' ? t.stringWithPrefix(value) : t.string('NONE'),
@@ -62,7 +62,7 @@ const mapSelectableInputs = (discover, t) => {
                 value
             })),
         renderLabelText: options.some(({ selected, value }) => selected && value === null) ?
-            () => t.stringWithPrefix(name, 'SELECT_')
+            () => t.stringWithPrefix(name.toUpperCase(), 'SELECT_')
             :
             null,
         onSelect: (event) => {
diff --git a/src/routes/Settings/useStreamingServerSettingsInputs.js b/src/routes/Settings/useStreamingServerSettingsInputs.js
index 1d4eee066..4bebd4d0e 100644
--- a/src/routes/Settings/useStreamingServerSettingsInputs.js
+++ b/src/routes/Settings/useStreamingServerSettingsInputs.js
@@ -140,7 +140,7 @@ const useStreamingServerSettingsInputs = (streamingServer) => {
         return {
             options: Object.keys(TORRENT_PROFILES)
                 .map((profileName) => ({
-                    label: profileName,
+                    label: t('TORRENT_PROFILE_' + profileName.replace(' ', '_').toUpperCase()),
                     value: JSON.stringify(TORRENT_PROFILES[profileName])
                 }))
                 .concat(