diff --git a/homeassistant/components/zha/__init__.py b/homeassistant/components/zha/__init__.py
index 6c7e83689ad..a53e5864552 100644
--- a/homeassistant/components/zha/__init__.py
+++ b/homeassistant/components/zha/__init__.py
@@ -29,11 +29,11 @@ from .core.gateway import establish_device_mappings
 from .core.channels.registry import populate_channel_registry
 
 REQUIREMENTS = [
-    'bellows==0.7.0',
-    'zigpy==0.2.0',
-    'zigpy-xbee==0.1.1',
+    'bellows-homeassistant==0.7.1',
+    'zigpy-homeassistant==0.3.0',
+    'zigpy-xbee-homeassistant==0.1.2',
     'zha-quirks==0.0.6',
-    'zigpy-deconz==0.0.1'
+    'zigpy-deconz==0.1.1'
 ]
 
 DEVICE_CONFIG_SCHEMA_ENTRY = vol.Schema({
diff --git a/requirements_all.txt b/requirements_all.txt
index 37b86f24ced..63cb4b87072 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -196,7 +196,7 @@ batinfo==0.4.2
 beautifulsoup4==4.7.1
 
 # homeassistant.components.zha
-bellows==0.7.0
+bellows-homeassistant==0.7.1
 
 # homeassistant.components.bmw_connected_drive
 bimmer_connected==0.5.3
@@ -1811,13 +1811,13 @@ zhong_hong_hvac==1.0.9
 ziggo-mediabox-xl==1.1.0
 
 # homeassistant.components.zha
-zigpy-deconz==0.0.1
+zigpy-deconz==0.1.1
 
 # homeassistant.components.zha
-zigpy-xbee==0.1.1
+zigpy-homeassistant==0.3.0
 
 # homeassistant.components.zha
-zigpy==0.2.0
+zigpy-xbee-homeassistant==0.1.2
 
 # homeassistant.components.zoneminder
 zm-py==0.3.3
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 5dc713d89cf..333233e76b3 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -50,7 +50,7 @@ aiounifi==4
 apns2==0.3.0
 
 # homeassistant.components.zha
-bellows==0.7.0
+bellows-homeassistant==0.7.1
 
 # homeassistant.components.calendar.caldav
 caldav==0.5.0
@@ -306,4 +306,4 @@ wakeonlan==1.1.6
 warrant==0.6.1
 
 # homeassistant.components.zha
-zigpy==0.2.0
+zigpy-homeassistant==0.3.0
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index c1f6af940fc..b298a9704ca 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -125,8 +125,8 @@ TEST_REQUIREMENTS = (
     'vultr',
     'YesssSMS',
     'ruamel.yaml',
-    'zigpy',
-    'bellows',
+    'zigpy-homeassistant',
+    'bellows-homeassistant',
 )
 
 IGNORE_PACKAGES = (