diff --git a/src/panels/config/zwave/ha-config-zwave.js b/src/panels/config/zwave/ha-config-zwave.js
index 57d822439b..d6d8e2f207 100644
--- a/src/panels/config/zwave/ha-config-zwave.js
+++ b/src/panels/config/zwave/ha-config-zwave.js
@@ -138,12 +138,6 @@ class HaConfigZwave extends LocalizeMixin(PolymerElement) {
             <ha-call-service-button hass="[[hass]]" domain="zwave" service="test_node" service-data="[[computeNodeServiceData(selectedNode)]]">Test Node</ha-call-service-button>
             <ha-service-description hass="[[hass]]" domain="zwave" service="test_node" hidden$="[[!showHelp]]"></ha-service-description>
           </div>
-          <div class="card-actions">
-            <paper-input float-label="New node name" type="text" value="{{newNodeNameInput}}" placeholder="[[computeGetNodeName(selectedNode)]]">
-            </paper-input>
-            <ha-call-service-button hass="[[hass]]" domain="zwave" service="rename_node" service-data="[[computeNodeNameServiceData(newNodeNameInput)]]">Rename Node</ha-call-service-button>
-            <ha-service-description hass="[[hass]]" domain="zwave" service="rename_node" hidden$="[[!showHelp]]"></ha-service-description>
-           </div>
 
            <div class="device-picker">
             <paper-dropdown-menu label="Entities of this node" dynamic-align="" class="flex">
@@ -302,10 +296,6 @@ class HaConfigZwave extends LocalizeMixin(PolymerElement) {
         type: Array,
       },
 
-      newNodeNameInput: {
-        type: String,
-      },
-
       userCodes: {
         type: Array,
         value: function () {
@@ -384,8 +374,6 @@ class HaConfigZwave extends LocalizeMixin(PolymerElement) {
   }
 
   selectedNodeChanged(selectedNode) {
-    this.newNodeNameInput = '';
-
     if (selectedNode === -1) return;
     this.selectedConfigParameter = -1;
     this.selectedConfigParameterValue = -1;
@@ -478,19 +466,6 @@ class HaConfigZwave extends LocalizeMixin(PolymerElement) {
     };
   }
 
-  computeGetNodeName(selectedNode) {
-    if (this.selectedNode === -1 ||
-      !this.nodes[selectedNode].entity_id) return -1;
-    return this.nodes[selectedNode].attributes.node_name;
-  }
-
-  computeNodeNameServiceData(newNodeNameInput) {
-    return {
-      node_id: this.nodes[this.selectedNode].attributes.node_id,
-      name: newNodeNameInput
-    };
-  }
-
   computeRefreshEntityServiceData(selectedEntity) {
     if (selectedEntity === -1) return -1;
     return { entity_id: this.entities[selectedEntity].entity_id };
diff --git a/src/panels/config/zwave/zwave-values.js b/src/panels/config/zwave/zwave-values.js
index 5495798fb3..1d10c8f5f0 100644
--- a/src/panels/config/zwave/zwave-values.js
+++ b/src/panels/config/zwave/zwave-values.js
@@ -45,14 +45,6 @@ class ZwaveValues extends PolymerElement {
           </paper-listbox>
         </paper-dropdown-menu>
         </div>
-        <template is="dom-if" if="[[!computeIsValueSelected(selectedValue)]]">
-          <div class="card-actions">
-            <paper-input float-label="Value Name" type="text" value="{{newValueNameInput}}" placeholder="[[computeGetValueName(selectedValue)]]">
-            </paper-input>
-            <ha-call-service-button hass="[[hass]]" domain="zwave" service="rename_value" service-data="[[computeValueNameServiceData(newValueNameInput)]]">Rename Value</ha-call-service-button>
-
-          </div>
-        </template>
       </paper-card>
     </div>
 `;
@@ -102,14 +94,6 @@ class ZwaveValues extends PolymerElement {
     return item.value.label + ' (Instance: ' + item.value.instance + ', Index: ' + item.value.index + ')';
   }
 
-  computeGetValueName(selectedValue) {
-    return this.values[selectedValue].value.label;
-  }
-
-  computeIsValueSelected(selectedValue) {
-    return (!this.nodes || this.selectedNode === -1 || selectedValue === -1);
-  }
-
   refreshValues(selectedNode) {
     var valueData = [];
     this.hass.callApi('GET', 'zwave/values/' + this.nodes[selectedNode].attributes.node_id).then(function (values) {
@@ -124,15 +108,6 @@ class ZwaveValues extends PolymerElement {
     }.bind(this));
   }
 
-  computeValueNameServiceData(newValueNameInput) {
-    if (!this.selectedNode === -1 || this.selectedValue === -1) return -1;
-    return {
-      node_id: this.nodes[this.selectedNode].attributes.node_id,
-      value_id: this.values[this.selectedValue].key,
-      name: newValueNameInput,
-    };
-  }
-
   selectedValueChanged(selectedValue) {
     if (!this.selectedNode === -1 || this.selectedValue === -1) return;
     var el = this;