diff --git a/homeassistant/components/garage_door/__init__.py b/homeassistant/components/garage_door/__init__.py
index ebaa37a78c9..2dc77885294 100644
--- a/homeassistant/components/garage_door/__init__.py
+++ b/homeassistant/components/garage_door/__init__.py
@@ -91,11 +91,11 @@ class GarageDoorDevice(Entity):
         """ Is the garage door closed or opened. """
         return None
 
-    def close(self):
+    def close_door(self):
         """ Closes the garage door. """
         raise NotImplementedError()
 
-    def open(self):
+    def open_door(self):
         """ Opens the garage door. """
         raise NotImplementedError()
 
diff --git a/tests/components/garage_door/test_demo.py b/tests/components/garage_door/test_demo.py
index 5e510851f30..a0b80235a94 100644
--- a/tests/components/garage_door/test_demo.py
+++ b/tests/components/garage_door/test_demo.py
@@ -37,14 +37,14 @@ class TestGarageDoorDemo(unittest.TestCase):
         self.hass.states.is_state(RIGHT, 'open')
 
     def test_open_door(self):
-        gd.open(self.hass, LEFT)
+        gd.open_door(self.hass, LEFT)
 
         self.hass.pool.block_till_done()
 
         self.assertTrue(gd.is_closed(self.hass, LEFT))
 
     def test_close_door(self):
-        gd.close(self.hass, RIGHT)
+        gd.close_door(self.hass, RIGHT)
 
         self.hass.pool.block_till_done()