diff --git a/webext/_locales/de/messages.json b/webext/_locales/de/messages.json
index 1b12b34..08911c9 100644
--- a/webext/_locales/de/messages.json
+++ b/webext/_locales/de/messages.json
@@ -314,32 +314,32 @@
     "description": "Title for Apps options"
   },
 
-  "start_application": {
+  "apps_start_application": {
     "message": "Startanwendung",
     "description": "The start application parameters"
   },
 
-  "start_app": {
+  "apps_start_app": {
     "message": "Anwendung: ",
     "description": "The start application"
   },
 
-  "start_app_args": {
+  "apps_start_app_args": {
     "message": "Argumente: ",
     "description": "Arguments for a start application"
   },
 
-  "close_application": {
+  "apps_close_application": {
     "message": "Stopanwendung",
     "description": "The close application parameters"
   },
 
-  "close_app": {
+  "apps_close_app": {
     "message": "Anwendung: ",
     "description": "The close application"
   },
 
-  "close_app_args": {
+  "apps_close_app_args": {
     "message": "Argumente: ",
     "description": "Arguments for a close application"
   },
diff --git a/webext/_locales/el/messages.json b/webext/_locales/el/messages.json
index cc3b4ab..34636ee 100644
--- a/webext/_locales/el/messages.json
+++ b/webext/_locales/el/messages.json
@@ -314,32 +314,32 @@
     "description": "Title for Apps options"
   },
 
-  "start_application": {
+  "apps_start_application": {
     "message": "Εφαρμογή εκκίνησης",
     "description": "The start application parameters"
   },
 
-  "start_app": {
+  "apps_start_app": {
     "message": "Εφαρμογή: ",
     "description": "The start application"
   },
 
-  "start_app_args": {
+  "apps_start_app_args": {
     "message": "Επιχειρήματα: ",
     "description": "Arguments for a start application"
   },
 
-  "close_application": {
+  "apps_close_application": {
     "message": "Κλείσιμο αίτησης",
     "description": "The close application parameters"
   },
 
-  "close_app": {
+  "apps_close_app": {
     "message": "Εφαρμογή: ",
     "description": "The close application"
   },
 
-  "close_app_args": {
+  "apps_close_app_args": {
     "message": "Επιχειρήματα: ",
     "description": "Arguments for a close application"
   },
diff --git a/webext/_locales/en-US/messages.json b/webext/_locales/en-US/messages.json
index 48e9fc7..d48bae7 100644
--- a/webext/_locales/en-US/messages.json
+++ b/webext/_locales/en-US/messages.json
@@ -314,32 +314,32 @@
     "description": "Title for Apps options"
   },
 
-  "start_application": {
+  "apps_start_application": {
     "message": "Start application",
     "description": "The start application parameters"
   },
 
-  "start_app": {
+  "apps_start_app": {
     "message": "Application: ",
     "description": "The start application"
   },
 
-  "start_app_args": {
+  "apps_start_app_args": {
     "message": "Arguments: ",
     "description": "Arguments for a start application"
   },
 
-  "close_application": {
+  "apps_close_application": {
     "message": "Closing application",
     "description": "The close application parameters"
   },
 
-  "close_app": {
+  "apps_close_app": {
     "message": "Application: ",
     "description": "The close application"
   },
 
-  "close_app_args": {
+  "apps_close_app_args": {
     "message": "Arguments: ",
     "description": "Arguments for a close application"
   },
diff --git a/webext/_locales/it/messages.json b/webext/_locales/it/messages.json
index 864ff45..d7533fb 100644
--- a/webext/_locales/it/messages.json
+++ b/webext/_locales/it/messages.json
@@ -314,32 +314,32 @@
     "description": "Title for Apps options"
   },
 
-  "start_application": {
+  "apps_start_application": {
     "message": "Applicazione di avvio",
     "description": "The start application parameters"
   },
 
-  "start_app": {
+  "apps_start_app": {
     "message": "Applicazione: ",
     "description": "The start application"
   },
 
-  "start_app_args": {
+  "apps_start_app_args": {
     "message": "Argomenti: ",
     "description": "Arguments for a start application"
   },
 
-  "close_application": {
+  "apps_close_application": {
     "message": "Applicazione alla chiusura",
     "description": "The close application parameters"
   },
 
-  "close_app": {
+  "apps_close_app": {
     "message": "Applicazione: ",
     "description": "The close application"
   },
 
-  "close_app_args": {
+  "apps_close_app_args": {
     "message": "Argomenti: ",
     "description": "Arguments for a close application"
   },
diff --git a/webext/_locales/nl/messages.json b/webext/_locales/nl/messages.json
index 156b29a..6711d43 100644
--- a/webext/_locales/nl/messages.json
+++ b/webext/_locales/nl/messages.json
@@ -314,32 +314,32 @@
     "description": "Title for Apps options"
   },
 
-  "start_application": {
+  "apps_start_application": {
     "message": "Start programma",
     "description": "The start application parameters"
   },
 
-  "start_app": {
+  "apps_start_app": {
     "message": "Programma: ",
     "description": "The start application"
   },
 
-  "start_app_args": {
+  "apps_start_app_args": {
     "message": "Argumenten: ",
     "description": "Arguments for a start application"
   },
 
-  "close_application": {
+  "apps_close_application": {
     "message": "Stop programma",
     "description": "The close application parameters"
   },
 
-  "close_app": {
+  "apps_lose_app": {
     "message": "Programma: ",
     "description": "The close application"
   },
 
-  "close_app_args": {
+  "apps_close_app_args": {
     "message": "Argumenten: ",
     "description": "Arguments for a close application"
   },
diff --git a/webext/_locales/pt-BR/messages.json b/webext/_locales/pt-BR/messages.json
index 0b65ab1..da35ac5 100644
--- a/webext/_locales/pt-BR/messages.json
+++ b/webext/_locales/pt-BR/messages.json
@@ -314,32 +314,32 @@
     "description": "Title for Apps options"
   },
 
-  "start_application": {
+  "apps_start_application": {
     "message": "Aplicativo de inicialização",
     "description": "The start application parameters"
   },
 
-  "start_app": {
+  "apps_start_app": {
     "message": "Aplicativo: ",
     "description": "The start application"
   },
 
-  "start_app_args": {
+  "apps_start_app_args": {
     "message": "Argumentos: ",
     "description": "Arguments for a start application"
   },
 
-  "close_application": {
+  "apps_close_application": {
     "message": "Fechando aplicativo",
     "description": "The close application parameters"
   },
 
-  "close_app": {
+  "apps_close_app": {
     "message": "Aplicativo: ",
     "description": "The close application"
   },
 
-  "close_app_args": {
+  "apps_close_app_args": {
     "message": "Argumentos: ",
     "description": "Arguments for a close application"
   },
diff --git a/webext/_locales/ru/messages.json b/webext/_locales/ru/messages.json
index 44ec014..23d400e 100644
--- a/webext/_locales/ru/messages.json
+++ b/webext/_locales/ru/messages.json
@@ -314,32 +314,32 @@
     "description": "Title for Apps options"
   },
 
-  "start_application": {
+  "apps_start_application": {
     "message": "Приложение при запуске",
     "description": "The start application parameters"
   },
 
-  "start_app": {
+  "apps_start_app": {
     "message": "Приложение: ",
     "description": "The start application"
   },
 
-  "start_app_args": {
+  "apps_start_app_args": {
     "message": "аргументы: ",
     "description": "Arguments for a start application"
   },
 
-  "close_application": {
+  "apps_lose_application": {
     "message": "Заявление о закрытии",
     "description": "The close application parameters"
   },
 
-  "close_app": {
+  "apps_close_app": {
     "message": "Приложение: ",
     "description": "The close application"
   },
 
-  "close_app_args": {
+  "apps_close_app_args": {
     "message": "аргументы: ",
     "description": "Arguments for a close application"
   },
diff --git a/webext/options.html b/webext/options.html
index 9139e0f..8231cbf 100644
--- a/webext/options.html
+++ b/webext/options.html
@@ -519,11 +519,11 @@
 
         <table id="startappselect">
           <caption>
-            __MSG_start_application__
+            __MSG_apps_start_application__
           </caption>
           <tr id="startApp">
             <td>
-              <label>__MSG_start_app__</label>
+              <label>__MSG_apps_start_app__</label>
             </td>
             <td>
               <input
@@ -534,7 +534,7 @@
           </tr>
           <tr id="startAppArgs">
             <td>
-              <label>__MSG_start_app_args__</label>
+              <label>__MSG_apps_start_app_args__</label>
             </td>
             <td>
               <input
@@ -547,11 +547,11 @@
 
         <table id="closeappselect">
           <caption>
-            __MSG_close_application__
+            __MSG_apps_close_application__
           </caption>
           <tr id="closeApp">
             <td>
-              <label>__MSG_close_app__</label>
+              <label>__MSG_apps_close_app__</label>
             </td>
             <td>
               <input
@@ -562,7 +562,7 @@
           </tr>
           <tr id="closeAppArgs">
             <td>
-              <label>__MSG_close_app_args__</label>
+              <label>__MSG_apps_close_app_args__</label>
             </td>
             <td>
               <input