diff --git a/lib/devices.js b/lib/devices.js
index ab2dd59f..c11e3252 100644
--- a/lib/devices.js
+++ b/lib/devices.js
@@ -7,28 +7,28 @@ const devices = {
         vendor: 'Xiaomi',
         description: 'MiJia wireless switch',
         supports: 'single, double, triple, quadruple, many and long click',
-        homeassistant: [homeassistant.sensor_button]
+        homeassistant: [homeassistant.sensor_click]
     },
     'lumi.sensor_switch.aq2': {
         model: 'WXKG11LM',
         vendor: 'Xiaomi',
         description: 'Aqara wireless switch',
         supports: 'single, double, triple, quadruple click',
-        homeassistant: [homeassistant.sensor_button]
+        homeassistant: [homeassistant.sensor_click]
     },
     'lumi.sensor_86sw1\u0000lu': {
         model: 'WXKG03LM',
         vendor: 'Xiaomi',
         description: 'Aqara single key wireless wall switch',
         supports: 'single click',
-        homeassistant: [homeassistant.sensor_button]
+        homeassistant: [homeassistant.sensor_click]
     },
     'lumi.sensor_86sw2\u0000Un': {
         model: 'WXKG02LM',
         vendor: 'Xiaomi',
         description: 'Aqara double key wireless wall switch',
         supports: 'left, right and both click',
-        homeassistant: [homeassistant.sensor_button]
+        homeassistant: [homeassistant.sensor_click]
     },
     'lumi.ctrl_neutral1': {
         model: 'QBKG04LM',
diff --git a/lib/homeassistant.js b/lib/homeassistant.js
index 1e9937fa..f9e7db57 100644
--- a/lib/homeassistant.js
+++ b/lib/homeassistant.js
@@ -77,9 +77,9 @@ const configurations = {
             json_attributes: ['battery'],
         }
     },
-    'sensor_button': {
+    'sensor_click': {
         type: 'sensor',
-        object_id: 'button',
+        object_id: 'click',
         discovery_payload: {
             icon: 'mdi:toggle-switch',
             value_template: '{{ value_json.click }}',