diff --git a/.coveragerc b/.coveragerc
index ff02e55d1f9..61a5eb7647e 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -201,6 +201,7 @@ omit =
     homeassistant/components/fints/sensor.py
     homeassistant/components/fitbit/sensor.py
     homeassistant/components/fixer/sensor.py
+    homeassistant/components/fleetgo/device_tracker.py
     homeassistant/components/flexit/climate.py
     homeassistant/components/flic/binary_sensor.py
     homeassistant/components/flock/notify.py
@@ -514,7 +515,6 @@ omit =
     homeassistant/components/rfxtrx/*
     homeassistant/components/ring/camera.py
     homeassistant/components/ripple/sensor.py
-    homeassistant/components/ritassist/device_tracker.py
     homeassistant/components/rocketchat/notify.py
     homeassistant/components/roku/*
     homeassistant/components/roomba/vacuum.py
diff --git a/homeassistant/components/fleetgo/__init__.py b/homeassistant/components/fleetgo/__init__.py
new file mode 100644
index 00000000000..659f30ac443
--- /dev/null
+++ b/homeassistant/components/fleetgo/__init__.py
@@ -0,0 +1 @@
+"""The FleetGO component."""
diff --git a/homeassistant/components/ritassist/device_tracker.py b/homeassistant/components/fleetgo/device_tracker.py
similarity index 87%
rename from homeassistant/components/ritassist/device_tracker.py
rename to homeassistant/components/fleetgo/device_tracker.py
index 69bf2454f86..dac5d654c41 100644
--- a/homeassistant/components/ritassist/device_tracker.py
+++ b/homeassistant/components/fleetgo/device_tracker.py
@@ -1,4 +1,4 @@
-"""Support for RitAssist Platform."""
+"""Support for FleetGO Platform."""
 import logging
 
 import requests
@@ -27,18 +27,18 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 def setup_scanner(hass, config: dict, see, discovery_info=None):
     """Set up the DeviceScanner and check if login is valid."""
-    scanner = RitAssistDeviceScanner(config, see)
+    scanner = FleetGoDeviceScanner(config, see)
     if not scanner.login(hass):
-        _LOGGER.error('RitAssist authentication failed')
+        _LOGGER.error('FleetGO authentication failed')
         return False
     return True
 
 
-class RitAssistDeviceScanner:
-    """Define a scanner for the RitAssist platform."""
+class FleetGoDeviceScanner:
+    """Define a scanner for the FleetGO platform."""
 
     def __init__(self, config, see):
-        """Initialize RitAssistDeviceScanner."""
+        """Initialize FleetGoDeviceScanner."""
         from ritassist import API
 
         self._include = config.get(CONF_INCLUDE)
@@ -57,7 +57,7 @@ class RitAssistDeviceScanner:
                               second=range(0, 60, 30))
 
     def login(self, hass):
-        """Perform a login on the RitAssist API."""
+        """Perform a login on the FleetGO API."""
         if self._api.login():
             self.setup(hass)
             return True
@@ -81,4 +81,4 @@ class RitAssistDeviceScanner:
                               icon='mdi:car')
 
         except requests.exceptions.ConnectionError:
-            _LOGGER.error('ConnectionError: Could not connect to RitAssist')
+            _LOGGER.error('ConnectionError: Could not connect to FleetGO')
diff --git a/homeassistant/components/fleetgo/manifest.json b/homeassistant/components/fleetgo/manifest.json
new file mode 100644
index 00000000000..c37ece4ebd8
--- /dev/null
+++ b/homeassistant/components/fleetgo/manifest.json
@@ -0,0 +1,10 @@
+{
+  "domain": "fleetgo",
+  "name": "FleetGO",
+  "documentation": "https://www.home-assistant.io/components/fleetgo",
+  "requirements": [
+    "ritassist==0.9.2"
+  ],
+  "dependencies": [],
+  "codeowners": []
+}
\ No newline at end of file
diff --git a/homeassistant/components/ritassist/__init__.py b/homeassistant/components/ritassist/__init__.py
deleted file mode 100644
index 653e18874d3..00000000000
--- a/homeassistant/components/ritassist/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""The ritassist component."""
diff --git a/homeassistant/components/ritassist/manifest.json b/homeassistant/components/ritassist/manifest.json
deleted file mode 100644
index af8464e4e93..00000000000
--- a/homeassistant/components/ritassist/manifest.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "domain": "ritassist",
-  "name": "Ritassist",
-  "documentation": "https://www.home-assistant.io/components/ritassist",
-  "requirements": [
-    "ritassist==0.9.2"
-  ],
-  "dependencies": [],
-  "codeowners": []
-}
diff --git a/requirements_all.txt b/requirements_all.txt
index fcfcca0c574..a830431c4d3 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1615,7 +1615,7 @@ rflink==0.0.46
 # homeassistant.components.ring
 ring_doorbell==0.2.3
 
-# homeassistant.components.ritassist
+# homeassistant.components.fleetgo
 ritassist==0.9.2
 
 # homeassistant.components.rejseplanen