diff --git a/homeassistant/components/zha/core/const.py b/homeassistant/components/zha/core/const.py
index 1e41cbbbec5..521bd529e30 100644
--- a/homeassistant/components/zha/core/const.py
+++ b/homeassistant/components/zha/core/const.py
@@ -1,6 +1,12 @@
 """All constants related to the ZHA component."""
 import enum
 
+from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR
+from homeassistant.components.fan import DOMAIN as FAN
+from homeassistant.components.light import DOMAIN as LIGHT
+from homeassistant.components.sensor import DOMAIN as SENSOR
+from homeassistant.components.switch import DOMAIN as SWITCH
+
 DOMAIN = 'zha'
 
 BAUD_RATES = [
@@ -17,13 +23,13 @@ DATA_ZHA_CORE_EVENTS = 'zha_core_events'
 DATA_ZHA_GATEWAY = 'zha_gateway'
 ZHA_DISCOVERY_NEW = 'zha_discovery_new_{}'
 
-COMPONENTS = [
-    'binary_sensor',
-    'fan',
-    'light',
-    'sensor',
-    'switch',
-]
+COMPONENTS = (
+    BINARY_SENSOR,
+    FAN,
+    LIGHT,
+    SENSOR,
+    SWITCH,
+)
 
 CONF_BAUDRATE = 'baudrate'
 CONF_DATABASE = 'database_path'
@@ -141,7 +147,7 @@ REPORT_CONFIG_DEFAULT = (REPORT_CONFIG_MIN_INT, REPORT_CONFIG_MAX_INT,
 REPORT_CONFIG_ASAP = (REPORT_CONFIG_MIN_INT_ASAP, REPORT_CONFIG_MAX_INT,
                       REPORT_CONFIG_RPT_CHANGE)
 REPORT_CONFIG_BATTERY_SAVE = (REPORT_CONFIG_MIN_INT_BATTERY_SAVE,
-                              REPORT_CONFIG_MAX_INT,
+                              REPORT_CONFIG_MAX_INT_BATTERY_SAVE,
                               REPORT_CONFIG_RPT_CHANGE)
 REPORT_CONFIG_IMMEDIATE = (REPORT_CONFIG_MIN_INT_IMMEDIATE,
                            REPORT_CONFIG_MAX_INT,