diff --git a/docs/tfw_architecture.png b/docs/tfw_architecture.png
index b5f4fc4..fa53dd6 100644
Binary files a/docs/tfw_architecture.png and b/docs/tfw_architecture.png differ
diff --git a/lib/tfw/components/__init__.py b/lib/tfw/components/__init__.py
index 9d2a1ac..663c141 100644
--- a/lib/tfw/components/__init__.py
+++ b/lib/tfw/components/__init__.py
@@ -4,6 +4,6 @@
 from .directory_monitoring_event_handler import DirectoryMonitoringEventHandler
 from .process_managing_event_handler import ProcessManagingEventHandler
 from .terminado_event_handler import TerminadoEventHandler
-from .webide_event_handler import WebideEventHandler
+from .ide_event_handler import IdeEventHandler
 from .history_monitor import HistoryMonitor, BashMonitor, GDBMonitor
 from .terminal_commands import TerminalCommands
diff --git a/lib/tfw/components/directory_monitor.py b/lib/tfw/components/directory_monitor.py
index 9413fe5..2fa724c 100644
--- a/lib/tfw/components/directory_monitor.py
+++ b/lib/tfw/components/directory_monitor.py
@@ -17,7 +17,7 @@ LOG = logging.getLogger(__name__)
 class DirectoryMonitor(ObserverMixin):
     def __init__(self, directory):
         ObserverMixin.__init__(self)
-        self.eventhandler = WebideReloadWatchdogEventHandler()
+        self.eventhandler = IdeReloadWatchdogEventHandler()
         self.observer.schedule(self.eventhandler, directory, recursive=True)
         self.pause, self.resume = self.eventhandler.pause, self.eventhandler.resume
 
@@ -42,7 +42,7 @@ class DirectoryMonitor(ObserverMixin):
             self.directorymonitor.resume()
 
 
-class WebideReloadWatchdogEventHandler(FileSystemWatchdogEventHandler):
+class IdeReloadWatchdogEventHandler(FileSystemWatchdogEventHandler):
     def __init__(self):
         super().__init__()
         self.uplink = ServerUplinkConnector()
@@ -63,7 +63,7 @@ class WebideReloadWatchdogEventHandler(FileSystemWatchdogEventHandler):
             self.ignore = self.ignore - 1
             return
         LOG.debug(event)
-        self.uplink.send({'key': 'webide',
+        self.uplink.send({'key': 'ide',
                           'data': {'command': 'reload'}})
 
 
diff --git a/lib/tfw/components/webide_event_handler.py b/lib/tfw/components/ide_event_handler.py
similarity index 99%
rename from lib/tfw/components/webide_event_handler.py
rename to lib/tfw/components/ide_event_handler.py
index 7196981..1f95780 100644
--- a/lib/tfw/components/webide_event_handler.py
+++ b/lib/tfw/components/ide_event_handler.py
@@ -91,7 +91,7 @@ class FileManager:  # pylint: disable=too-many-instance-attributes
         return relpath(self._filepath(filename), start=self._workdir)
 
 
-class WebideEventHandler(EventHandlerBase, MonitorManagerMixin):
+class IdeEventHandler(EventHandlerBase, MonitorManagerMixin):
     # pylint: disable=too-many-arguments
     """
     Event handler implementing the backend of our browser based IDE.