diff --git a/nymea-app/ruletemplates/accesscontroltemplates.json b/nymea-app/ruletemplates/accesscontroltemplates.json
index 715891ac..8216429b 100644
--- a/nymea-app/ruletemplates/accesscontroltemplates.json
+++ b/nymea-app/ruletemplates/accesscontroltemplates.json
@@ -1,7 +1,6 @@
 {
     "templates": [
         {
-            "interfaceName": "accesscontrol",
             "description": "Alert me on denied access attempts",
             "ruleNameTemplate": "Denied access attempt on %0",
             "eventDescriptorTemplates": [
@@ -30,7 +29,6 @@
             ]
         },
         {
-            "interfaceName": "accesscontrol",
             "description": "Notify my about access",
             "ruleNameTemplate": "Access granted on %0",
             "eventDescriptorTemplates": [
@@ -59,7 +57,6 @@
             ]
         },
         {
-            "interfaceName": "useraccesscontrol",
             "description": "Notify my about user access",
             "ruleNameTemplate": "Access granted to user on %0",
             "eventDescriptorTemplates": [
diff --git a/nymea-app/ruletemplates/buttontemplates.json b/nymea-app/ruletemplates/buttontemplates.json
index cbf81f2a..16a147d7 100644
--- a/nymea-app/ruletemplates/buttontemplates.json
+++ b/nymea-app/ruletemplates/buttontemplates.json
@@ -100,7 +100,6 @@
             ]
         },
         {
-            "interfaceName": "button",
             "description": "Turn off all lights",
             "ruleNameTemplate": "Turn off everything with %0",
             "eventDescriptorTemplates": [
diff --git a/nymea-app/ruletemplates/daylightsensor.json b/nymea-app/ruletemplates/daylightsensor.json
index f9dd8a51..e41f7ae4 100644
--- a/nymea-app/ruletemplates/daylightsensor.json
+++ b/nymea-app/ruletemplates/daylightsensor.json
@@ -1,8 +1,7 @@
 {
     "templates": [
         {
-            "interfaceName": "daylightsensor",
-            "description": "Turn on a light while it's dark outside.",
+            "description": "Turn on a light while it's dark outside",
             "ruleNameTemplate": "Turn on %1 while it's dark outside",
             "stateEvaluatorTemplate": {
                 "stateDescriptorTemplate": {
@@ -41,9 +40,8 @@
             ]
         },
         {
-            "interfaceName": "daylightsensor",
-            "description": "Turn on a light when it gets dark outside.",
-            "ruleNameTemplate": "Turn on %1 when it gets dark outside (%0).",
+            "description": "Turn on a light when it gets dark outside",
+            "ruleNameTemplate": "Turn on %1 when it gets dark outside (%0)",
             "eventDescriptorTemplates": [
                 {
                     "interfaceName": "daylightsensor",
@@ -73,9 +71,8 @@
             ]
         },
         {
-            "interfaceName": "daylightsensor",
-            "description": "Turn on all lights when it gets dark outside.",
-            "ruleNameTemplate": "Turn on all lights when it gets dark outside.",
+            "description": "Turn on all lights when it gets dark outside",
+            "ruleNameTemplate": "Turn on all lights when it gets dark outside",
             "eventDescriptorTemplates": [
                 {
                     "interfaceName": "daylightsensor",
diff --git a/nymea-app/ruletemplates/notificationtemplates.json b/nymea-app/ruletemplates/notificationtemplates.json
index 71560b16..6feacebb 100644
--- a/nymea-app/ruletemplates/notificationtemplates.json
+++ b/nymea-app/ruletemplates/notificationtemplates.json
@@ -1,7 +1,7 @@
 {
     "templates": [
         {
-            "description": "Notify me when a device runs out of battery.",
+            "description": "Notify me when a device runs out of battery",
             "ruleNameTemplate": "Low battery alert for %0",
             "stateEvaluatorTemplate": {
                 "stateDescriptorTemplate": {
@@ -32,7 +32,7 @@
             ]
         },
         {
-            "description": "Notify me when something runs dry.",
+            "description": "Notify me when something runs dry",
             "ruleNameTemplate": "Notify %1 when %0 runs dry",
             "stateEvaluatorTemplate": {
                 "stateDescriptorTemplate": {
@@ -63,7 +63,7 @@
             ]
         },
         {
-            "description": "Notify me when a thing gets disconnected.",
+            "description": "Notify me when a thing gets disconnected",
             "ruleNameTemplate": "Disconnect alert for %0",
             "stateEvaluatorTemplate": {
                 "stateDescriptorTemplate": {
@@ -95,8 +95,7 @@
             ]
         },
         {
-            "interfaceName": "notifications",
-            "description": "Notify me when a thing connects.",
+            "description": "Notify me when a thing connects",
             "ruleNameTemplate": "Connection notification for %0",
             "stateEvaluatorTemplate": {
                 "stateDescriptorTemplate": {
diff --git a/nymea-app/ruletemplates/presencesensortemplates.json b/nymea-app/ruletemplates/presencesensortemplates.json
index 87461153..4a143baf 100644
--- a/nymea-app/ruletemplates/presencesensortemplates.json
+++ b/nymea-app/ruletemplates/presencesensortemplates.json
@@ -1,8 +1,7 @@
 {
     "templates": [
         {
-            "interfaceName": "presencesensor",
-            "description": "Turn on something while being present.",
+            "description": "Turn on something while being present",
             "ruleNameTemplate": "Turn on %1 while %0 reports presence",
             "stateEvaluatorTemplate": {
                 "stateDescriptorTemplate": {
@@ -41,8 +40,7 @@
             ]
         },
         {
-            "interfaceName": "presencesensor",
-            "description": "Turn off something when leaving.",
+            "description": "Turn off something when leaving",
             "ruleNameTemplate": "Turn off %1 when %0 reports leaving",
             "eventDescriptorTemplates": [
                 {
@@ -73,8 +71,7 @@
             ]
         },
         {
-            "interfaceName": "presencesensor",
-            "description": "Turn off everything when leaving.",
+            "description": "Turn off everything when leaving",
             "ruleNameTemplate": "Turn off everything when %0 reports leaving",
             "eventDescriptorTemplates": [
                 {
@@ -106,8 +103,7 @@
             ]
         },
         {
-            "interfaceName": "presencesensor",
-            "description": "Turn off all lights when leaving.",
+            "description": "Turn off all lights when leaving",
             "ruleNameTemplate": "Turn off all lights when %0 reports leaving",
             "eventDescriptorTemplates": [
                 {
@@ -139,8 +135,7 @@
             ]
         },
         {
-            "interfaceName": "presencesensor",
-            "description": "Turn on something when arriving.",
+            "description": "Turn on something when arriving",
             "ruleNameTemplate": "Turn on %1 when %0 reports arriving",
             "eventDescriptorTemplates": [
                 {
diff --git a/nymea-app/ruletemplates/smartmetertemplates.json b/nymea-app/ruletemplates/smartmetertemplates.json
index 99485521..dc7c0078 100644
--- a/nymea-app/ruletemplates/smartmetertemplates.json
+++ b/nymea-app/ruletemplates/smartmetertemplates.json
@@ -1,8 +1,7 @@
 {
     "templates": [
         {
-            "interfaceName": "extendedsmartmeterproducer",
-            "description": "Charge my car while producing energy.",
+            "description": "Charge my car while producing energy",
             "ruleNameTemplate": "Smart car charging",
             "stateEvaluatorTemplate": {
                 "stateDescriptorTemplate": {
@@ -41,8 +40,7 @@
             ]
         },
         {
-            "interfaceName": "extendedsmartmeterproducer",
-            "description": "Turn on heating while producing energy.",
+            "description": "Turn on heating while producing energy",
             "ruleNameTemplate": "Smart heating",
             "stateEvaluatorTemplate": {
                 "stateDescriptorTemplate": {