diff --git a/ui/src/app/customer/customer.controller.js b/ui/src/app/customer/customer.controller.js
index c61962f9f3..2d1d2202a8 100644
--- a/ui/src/app/customer/customer.controller.js
+++ b/ui/src/app/customer/customer.controller.js
@@ -81,7 +81,7 @@ export default function CustomerController(customerService, $state, $stateParams
             onAction: function ($event, item) {
                 openCustomerEdges($event, item);
             },
-            name: function() { return $translate.instant('edge.edges') },
+            name: function() { return $translate.instant('edge.edge-instances') },
             details: function(customer) {
                 if (customer && customer.additionalInfo && customer.additionalInfo.isPublic) {
                     return $translate.instant('customer.manage-public-edges')
diff --git a/ui/src/app/edge/edge-fieldset.tpl.html b/ui/src/app/edge/edge-fieldset.tpl.html
index e96d12f391..05b4742f82 100644
--- a/ui/src/app/edge/edge-fieldset.tpl.html
+++ b/ui/src/app/edge/edge-fieldset.tpl.html
@@ -44,7 +44,7 @@
                class="md-raised md-primary">{{ 'edge.dashboards' | translate }}</md-button>
     <md-button ng-click="onManageEdgeRuleChains({event: $event})"
                ng-show="!isEdit && edgeScope === 'tenant'"
-               class="md-raised md-primary">{{ 'edge.rulechains' | translate }}</md-button>
+               class="md-raised md-primary">{{ 'edge.rulechain-templates' | translate }}</md-button>
 
 </div>
 <div layout="row">
diff --git a/ui/src/app/edge/edge.routes.js b/ui/src/app/edge/edge.routes.js
index ccfb3a7b14..e4b0d72727 100644
--- a/ui/src/app/edge/edge.routes.js
+++ b/ui/src/app/edge/edge.routes.js
@@ -46,10 +46,10 @@ export default function EdgeRoutes($stateProvider, types) {
                 searchEnabled: true,
                 searchByEntitySubtype: true,
                 searchEntityType: types.entityType.edge,
-                pageTitle: 'edge.edges'
+                pageTitle: 'edge.edge-instances'
             },
             ncyBreadcrumb: {
-                label: '{"icon": "router", "label": "edge.edges"}'
+                label: '{"icon": "router", "label": "edge.edge-instances"}'
             }
         }).state('home.edges.entityViews', {
             url: '/:edgeId/entityViews',
@@ -194,11 +194,11 @@ export default function EdgeRoutes($stateProvider, types) {
             },
             data: {
                 searchEnabled: true,
-                pageTitle: 'edge.rulechains',
+                pageTitle: 'edge.rulechain-templates',
                 ruleChainsType: 'edge'
             },
             ncyBreadcrumb: {
-                label: '{"icon": "code", "label": "rulechain.edge-rulechains"}'
+                label: '{"icon": "code", "label": "edge.rulechain-templates"}'
             }
         }).state('home.edges.ruleChains.ruleChain', {
             url: '/:ruleChainId',
@@ -232,7 +232,7 @@ export default function EdgeRoutes($stateProvider, types) {
             data: {
                 import: false,
                 searchEnabled: false,
-                pageTitle: 'edge.rulechain'
+                pageTitle: 'edge.rulechain-templates'
             },
             ncyBreadcrumb: {
                 label: '{"icon": "code", "label": "{{ vm.ruleChain.name }}", "translate": "false"}'
diff --git a/ui/src/app/locale/locale.constant-de_DE.json b/ui/src/app/locale/locale.constant-de_DE.json
index 81558e7ab2..e209d61c85 100644
--- a/ui/src/app/locale/locale.constant-de_DE.json
+++ b/ui/src/app/locale/locale.constant-de_DE.json
@@ -431,7 +431,7 @@
     "customer-required": "Kunde ist erforderlich",
     "select-default-customer": "Wählen Sie den Standardkunden aus.",
     "default-customer": "Standardkunde",
-    "edges": "Kunden Rand",
+    "edge-instances": "Kunden Rand",
     "default-customer-required": "Ein Standardkunde ist erforderlich, um das Dashboard auf Mandantenebene zu testen."
   },
   "datetime": {
@@ -730,7 +730,7 @@
   },
   "edge": {
     "edge": "Rand",
-    "edges": "Rand",
+    "edge-instances": "Rand",
     "management": "Rand verwalten",
     "no-edges-matching": "Keine passenden Rand '{{entity}}' gefunden.",
     "add": "Rand hinzufügen",
@@ -1355,8 +1355,6 @@
   "rulechain": {
     "rulechain": "Regelkette",
     "rulechains": "Regelketten",
-    "core-rulechains": "Kernregelketten",
-    "edge-rulechains": "Randregelketten",
     "root": "Wurzel",
     "delete": "Regelkette löschen",
     "name": "Name",
diff --git a/ui/src/app/locale/locale.constant-en_US.json b/ui/src/app/locale/locale.constant-en_US.json
index 5e02bc95b5..3bafe1813d 100644
--- a/ui/src/app/locale/locale.constant-en_US.json
+++ b/ui/src/app/locale/locale.constant-en_US.json
@@ -764,7 +764,7 @@
     },
     "edge": {
         "edge": "Edge",
-        "edges": "Edges",
+        "edge-instances": "Edge instances",
         "edge-file": "Edge file",
         "management": "Edge management",
         "no-edges-matching": "No edges matching '{{entity}}' were found.",
@@ -828,8 +828,8 @@
         "unassign-from-edge": "Unassign from edge",
         "dashboards": "Edge Dashboards",
         "manage-edge-rulechains": "Manage edge rule chains",
-        "rulechains": "Edge Rule Chains",
-        "rulechain": "Edge Rule Chain",
+        "rulechain-templates": "Rule chain templates",
+        "rulechain-template": "Rule chain template",
         "edge-key": "Edge key",
         "copy-edge-key": "Copy edge key",
         "edge-key-copied-message": "Edge key has been copied to clipboard",
@@ -1549,8 +1549,6 @@
     "rulechain": {
         "rulechain": "Rule chain",
         "rulechains": "Rule chains",
-        "core-rulechains": "Core Rule chains",
-        "edge-rulechains": "Edge Rule chains",
         "default-root": "Default root",
         "root": "Root",
         "delete": "Delete rule chain",
diff --git a/ui/src/app/locale/locale.constant-es_ES.json b/ui/src/app/locale/locale.constant-es_ES.json
index 060c762fec..59b354c191 100644
--- a/ui/src/app/locale/locale.constant-es_ES.json
+++ b/ui/src/app/locale/locale.constant-es_ES.json
@@ -743,7 +743,7 @@
     },
     "edge": {
         "edge": "Borde",
-        "edges": "Bordes",
+        "edge-instances": "Bordes",
         "management": "Gestión de bordes",
         "no-edges-matching": "No se encontraron bordes que coincidan con '{{entity}}'",
         "add": "Agregar borde",
@@ -1423,8 +1423,6 @@
     "rulechain": {
         "rulechain": "Cadena de reglas",
         "rulechains": "Cadenas de reglas",
-        "core-rulechains": "Cadenas de reglas centrales",
-        "edge-rulechains": "Cadenas de reglas de borde",
         "root": "Raíz",
         "delete": "Eliminar cadena de reglas",
         "name": "Nombre",
diff --git a/ui/src/app/locale/locale.constant-fr_FR.json b/ui/src/app/locale/locale.constant-fr_FR.json
index fcd2bc4d22..d6775567fb 100644
--- a/ui/src/app/locale/locale.constant-fr_FR.json
+++ b/ui/src/app/locale/locale.constant-fr_FR.json
@@ -748,7 +748,7 @@
     },
     "edge": {
         "edge": "Bordure",
-        "edges": "Bordures",
+        "edge-instances": "Bordures",
         "management": "Gestion des bordures",
         "no-edges-matching": "Aucun bordure correspondant à {{entity}} n'a été trouvé.",
         "add": "Ajouter un bordure",
@@ -1429,8 +1429,6 @@
         "rulechain-required": "Chaîne de règles requise",
         "rulechains": "Chaînes de règles",
         "select-rulechain": "Sélectionner la chaîne de règles",
-        "core-rulechains": "Chaînes de règles fondamentales",
-        "edge-rulechains": "Chaînes de règles de la bordure",
         "set-root": "Rend la chaîne de règles racine (root) ",
         "set-root-rulechain-text": "Après la confirmation, la chaîne de règles deviendra racine (root) et gérera tous les messages de transport entrants.",
         "set-root-rulechain-title": "Voulez-vous vraiment que la chaîne de règles '{{ruleChainName}} soit racine  (root) ?",
diff --git a/ui/src/app/rulechain/rulechain.routes.js b/ui/src/app/rulechain/rulechain.routes.js
index a1d5da43e2..359579c9c8 100644
--- a/ui/src/app/rulechain/rulechain.routes.js
+++ b/ui/src/app/rulechain/rulechain.routes.js
@@ -139,11 +139,11 @@ export default function RuleChainRoutes($stateProvider, NodeTemplatePathProvider
         },
         data: {
             searchEnabled: true,
-            pageTitle: 'rulechain.edge-rulechains',
+            pageTitle: 'edge.rulechain-templates',
             ruleChainsType: 'edges'
         },
         ncyBreadcrumb: {
-            label: '{"icon": "code", "label": "rulechain.edge-rulechains"}'
+            label: '{"icon": "code", "label": "edge.rulechain-templates"}'
         }
     }).state('home.edges.edgeRuleChains.ruleChain', {
         url: '/:ruleChainId',
@@ -177,7 +177,7 @@ export default function RuleChainRoutes($stateProvider, NodeTemplatePathProvider
         data: {
             import: false,
             searchEnabled: false,
-            pageTitle: 'edge.rulechain'
+            pageTitle: 'edge.rulechain-template'
         },
         ncyBreadcrumb: {
             label: '{"icon": "code", "label": "{{ vm.ruleChain.name }}", "translate": "false"}'
@@ -218,7 +218,7 @@ export default function RuleChainRoutes($stateProvider, NodeTemplatePathProvider
         data: {
             import: true,
             searchEnabled: true,
-            pageTitle: 'edge.rulechain'
+            pageTitle: 'edge.rulechain-template'
         },
         ncyBreadcrumb: {
             label: '{"icon": "code", "label": "{{ (\'rulechain.import\' | translate) + \': \'+ vm.ruleChain.name }}", "translate": "false"}'
diff --git a/ui/src/app/services/menu.service.js b/ui/src/app/services/menu.service.js
index 4d2c74da63..6b0337d0ab 100644
--- a/ui/src/app/services/menu.service.js
+++ b/ui/src/app/services/menu.service.js
@@ -194,13 +194,13 @@ function Menu(userService, $state, $rootScope) {
                                 icon: 'router',
                                 pages: [
                                     {
-                                        name: 'edge.edges',
+                                        name: 'edge.edge-instances',
                                         type: 'link',
                                         state: 'home.edges',
                                         icon: 'router'
                                     },
                                     {
-                                        name: 'rulechain.edge-rulechains',
+                                        name: 'edge.rulechain-templates',
                                         type: 'link',
                                         state: 'home.edges.edgeRuleChains',
                                         icon: 'code'
@@ -286,12 +286,12 @@ function Menu(userService, $state, $rootScope) {
                             name: 'edge.management',
                             places: [
                                 {
-                                    name: 'edge.edges',
+                                    name: 'edge.edge-instances',
                                     icon: 'router',
                                     state: 'home.edges'
                                 },
                                 {
-                                    name: 'rulechain.edge-rulechains',
+                                    name: 'edge.rulechain-templates',
                                     icon: 'code',
                                     state: 'home.edges.edgeRuleChains'
                                 }
@@ -354,7 +354,7 @@ function Menu(userService, $state, $rootScope) {
                     if (userService.isEdgesSupportEnabled()) {
                         sections.push(
                             {
-                                name: 'edge.edges',
+                                name: 'edge.edge-instances',
                                 type: 'link',
                                 state: 'home.edges',
                                 icon: 'router'
@@ -404,10 +404,10 @@ function Menu(userService, $state, $rootScope) {
                     if (userService.isEdgesSupportEnabled()) {
                         homeSections.push(
                             {
-                                name: 'edge.edges',
+                                name: 'edge.edge-instances',
                                 places: [
                                     {
-                                        name: 'edge.edges',
+                                        name: 'edge.edge-instances',
                                         icon: 'router',
                                         state: 'home.edges'
                                     }