diff --git a/source/_components/homematicip.markdown b/source/_components/homematicip_cloud.markdown
similarity index 72%
rename from source/_components/homematicip.markdown
rename to source/_components/homematicip_cloud.markdown
index 631720114ce..c2f5320aa7d 100644
--- a/source/_components/homematicip.markdown
+++ b/source/_components/homematicip_cloud.markdown
@@ -1,8 +1,8 @@
 ---
 layout: page
-title: "HomematicIP"
+title: "HomematicIP Cloud"
 description: "Instructions for integrating HomematicIP into Home Assistant."
-date: 2018-03-06 20:40
+date: 2018-04-02 13:40
 sidebar: true
 comments: false
 sharing: true
@@ -13,20 +13,20 @@ ha_release: 0.66
 featured: false
 ---
 
-The [HomematicIP](http://www.homematicip.com/) component platform is used as an interface to the cloud server.
+The [HomematicIP](http://www.homematic-ip.com) component platform is used as an interface to the cloud server.
 For for communication [homematicip-rest-api](https://github.com/coreGreenberet/homematicip-rest-api) is used.
 
 To set up the component:
 
-- **generate the authentication token**:
+- generate the authentication token:
 ```yaml
 generate_auth_token.py
 ```
 
-- ** add the information to your `configuration.yaml` file:
+- add the information to your `configuration.yaml` file:
 
 ```yaml
-homematicip:
+homematicip_cloud:
   - name: NAME
     accesspoint: IDENTIFIER
     authtoken: AUTHTOKEN
@@ -34,7 +34,7 @@ homematicip:
 
 Configuration variables (global):
 
-- **name** (*Required*): Name to identify your access point, this will be
+- **name** (*Optional*): Name to identify your access point, this will be
   used to prefix your device names.
 - **accesspoint** (*Required*): This is the access point id (SGTIN)
 - **authtoken** (*Required*): Authentification token generated with
diff --git a/source/_components/sensor.homematicip.markdown b/source/_components/sensor.homematicip.markdown
deleted file mode 100644
index 65350fc6023..00000000000
--- a/source/_components/sensor.homematicip.markdown
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: page
-title: "HomematicIP Sensor"
-description: "Instructions on how to integrate Homematic sensors within Home Assistant."
-date: 2016-06-28 08:30
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: homematic.png
-ha_category: Sensor
-ha_release: 0.66
-ha_iot_class: "Local Push"
----
-
-The `homematicip` sensor platform lets you control [Homematic](http://www.homematic.com/) sensors through Home Assistant.
-
-Devices will be configured automatically. Please refer to the [component](/components/homematicip/) configuration on how to setup Homematic.
diff --git a/source/_components/sensor.homematicip_cloud.markdown b/source/_components/sensor.homematicip_cloud.markdown
new file mode 100644
index 00000000000..bfb84498909
--- /dev/null
+++ b/source/_components/sensor.homematicip_cloud.markdown
@@ -0,0 +1,21 @@
+---
+layout: page
+title: "HomematicIP Cloud Sensor"
+description: "Instructions on how to integrate HomematIP sensors within Home Assistant."
+date: 2018-04-02 13:40
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: homematic.png
+ha_category: Sensor
+ha_release: 0.66
+ha_iot_class: "Local Push"
+---
+
+The `homematicip_cloud` sensor platform allows you to control
+[HomematicIP](http://www.homematicip.de) sensors through Home Assistant.
+
+Devices will be configured automatically. Please refer to the
+[component](/components/homematicip_cloud/) configuration on how to setup
+HomematicIP Cloud.