diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2de19a043..e97e80729 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,10 +44,10 @@ deploy-beta:
     - git worktree prune
     - rm -rf ../esphomelib
   script:
-    - git fetch --force git@github.com:OttoWinter/beta.esphomelib.com.git gh-pages:gh-pages
+    - git fetch --force git@github.com:OttoWinter/esphomedocs-beta.git gh-pages:gh-pages
     - git worktree add _build/html gh-pages
     - make ../esphomelib
     - CNAME="beta.esphomelib.com" make deploy
-    - git -C _build/html push -f git@github.com:OttoWinter/beta.esphomelib.com.git gh-pages
+    - git -C _build/html push git@github.com:OttoWinter/esphomedocs-beta.git gh-pages
   only:
     - rc
diff --git a/esphomeyaml/index.rst b/esphomeyaml/index.rst
index 95ee21ab5..f612e4b4a 100644
--- a/esphomeyaml/index.rst
+++ b/esphomeyaml/index.rst
@@ -638,9 +638,9 @@ Text Sensor Components
 ----------------------
 
 ================================================== ================================================== ==================================================
-|Text Sensor Core|_                                |MQTT Subscribe|_                                  |Version|_
+|Text Sensor Core|_                                |MQTT Subscribe Text|_                             |Version|_
 -------------------------------------------------- -------------------------------------------------- --------------------------------------------------
-`Text Sensor Core`_                                `MQTT Subscribe`_                                  `Version`_
+`Text Sensor Core`_                                `MQTT Subscribe Text`_                             `Version`_
 -------------------------------------------------- -------------------------------------------------- --------------------------------------------------
 |Template Text Sensor|_
 -------------------------------------------------- -------------------------------------------------- --------------------------------------------------
@@ -650,9 +650,9 @@ Text Sensor Components
 .. |Text Sensor Core| image:: /esphomeyaml/images/folder-open.svg
     :class: component-image
 .. _Text Sensor Core: /esphomeyaml/components/text_sensor/index.html
-.. |MQTT Subscribe| image:: /esphomeyaml/images/mqtt.png
+.. |MQTT Subscribe Text| image:: /esphomeyaml/images/mqtt.png
     :class: component-image
-.. _MQTT Subscribe: /esphomeyaml/components/text_sensor/mqtt_subscribe.html
+.. _MQTT Subscribe Text: /esphomeyaml/components/text_sensor/mqtt_subscribe.html
 .. |Version| image:: /esphomeyaml/images/new-box.svg
     :class: component-image
 .. _Version: /esphomeyaml/components/text_sensor/version.html
diff --git a/esphomeyaml/text_sensor.csv b/esphomeyaml/text_sensor.csv
index e32b17958..92c0f206d 100644
--- a/esphomeyaml/text_sensor.csv
+++ b/esphomeyaml/text_sensor.csv
@@ -1,4 +1,4 @@
 Text Sensor Core, components/text_sensor/index, folder-open.svg
-MQTT Subscribe, components/text_sensor/mqtt_subscribe, mqtt.png
+MQTT Subscribe Text, components/text_sensor/mqtt_subscribe, mqtt.png
 Version, components/text_sensor/version, new-box.svg
 Template Text Sensor, components/text_sensor/template, description.svg