diff --git a/solvable/src/event_handler_main.py b/solvable/src/event_handler_main.py
index 5be6423..39e38fd 100644
--- a/solvable/src/event_handler_main.py
+++ b/solvable/src/event_handler_main.py
@@ -151,12 +151,12 @@ def main():
     terminal.historymonitor.subscribe_callback(cenator)
 
     event_handlers = EventHandlerBase.get_local_instances()
-    def cleanup(sig, frame):
+    def stop(sig, frame):
         for eh in event_handlers:
-            eh.cleanup()
+            eh.stop()
         exit(0)
-    signal(SIGTERM, cleanup)
-    signal(SIGINT, cleanup)
+    signal(SIGTERM, stop)
+    signal(SIGINT, stop)
 
     IOLoop.instance().start()
 
diff --git a/solvable/src/pipe_io_main.py b/solvable/src/pipe_io_main.py
index 1edd1ab..c81787e 100644
--- a/solvable/src/pipe_io_main.py
+++ b/solvable/src/pipe_io_main.py
@@ -14,11 +14,11 @@ if __name__ == '__main__':
     )
 
     event_handlers = EventHandlerBase.get_local_instances()
-    def cleanup(sig, frame):
+    def stop(sig, frame):
         for eh in event_handlers:
-            eh.cleanup()
+            eh.stop()
         exit(0)
-    signal(SIGTERM, cleanup)
-    signal(SIGINT, cleanup)
+    signal(SIGTERM, stop)
+    signal(SIGINT, stop)
 
     IOLoop.instance().start()