diff --git a/homeassistant/components/motor/__init__.py b/homeassistant/components/rollershutter/__init__.py
similarity index 100%
rename from homeassistant/components/motor/__init__.py
rename to homeassistant/components/rollershutter/__init__.py
diff --git a/homeassistant/components/motor/mqtt.py b/homeassistant/components/rollershutter/mqtt.py
similarity index 100%
rename from homeassistant/components/motor/mqtt.py
rename to homeassistant/components/rollershutter/mqtt.py
diff --git a/homeassistant/components/motor/services.yaml b/homeassistant/components/rollershutter/services.yaml
similarity index 100%
rename from homeassistant/components/motor/services.yaml
rename to homeassistant/components/rollershutter/services.yaml
diff --git a/tests/components/motor/__init__.py b/tests/components/rollershutter/__init__.py
similarity index 100%
rename from tests/components/motor/__init__.py
rename to tests/components/rollershutter/__init__.py
diff --git a/tests/components/motor/test_mqtt.py b/tests/components/rollershutter/test_mqtt.py
similarity index 100%
rename from tests/components/motor/test_mqtt.py
rename to tests/components/rollershutter/test_mqtt.py