diff --git a/couchpotato/core/_base/_core/main.py b/couchpotato/core/_base/_core/main.py
index 127a0cf6..f7abddec 100644
--- a/couchpotato/core/_base/_core/main.py
+++ b/couchpotato/core/_base/_core/main.py
@@ -18,7 +18,7 @@ log = CPLog(__name__)
 
 class Core(Plugin):
 
-    ignore_restart = ['Core.crappyRestart', 'Core.crappyShutdown', 'Updater.check']
+    ignore_restart = ['Core.restart', 'Core.shutdown', 'Updater.check']
     shutdown_started = False
 
     def __init__(self):
@@ -37,8 +37,8 @@ class Core(Plugin):
             'desc': 'Get version.'
         })
 
-        addEvent('app.crappy_shutdown', self.crappyShutdown)
-        addEvent('app.crappy_restart', self.crappyRestart)
+        addEvent('app.shutdown', self.shutdown)
+        addEvent('app.restart', self.restart)
         addEvent('app.load', self.launchBrowser, priority = 1)
         addEvent('app.base_url', self.createBaseUrl)
         addEvent('app.api_url', self.createApiUrl)
@@ -59,21 +59,10 @@ class Core(Plugin):
             'succes': True
         })
 
-    def crappyShutdown(self):
-        if self.shutdown_started:
-            return
-
-        self.initShutdown()
-        return True
-
-    def crappyRestart(self):
-        if self.shutdown_started:
-            return
-
-        self.initShutdown(restart = True)
-        return True
-
     def shutdown(self):
+        if self.shutdown_started:
+            return False
+
         def shutdown():
             self.initShutdown()
         IOLoop.instance().add_callback(shutdown)
@@ -81,6 +70,9 @@ class Core(Plugin):
         return 'shutdown'
 
     def restart(self):
+        if self.shutdown_started:
+            return False
+
         def restart():
             self.initShutdown(restart = True)
         IOLoop.instance().add_callback(restart)
diff --git a/couchpotato/core/_base/desktop/main.py b/couchpotato/core/_base/desktop/main.py
index ce1ff282..dcec7050 100644
--- a/couchpotato/core/_base/desktop/main.py
+++ b/couchpotato/core/_base/desktop/main.py
@@ -27,7 +27,7 @@ if Env.get('desktop'):
             addEvent('app.after_shutdown', desktop.afterShutdown)
 
         def onClose(self, event):
-            return fireEvent('app.crappy_shutdown', single = True)
+            return fireEvent('app.shutdown', single = True)
 
 else:
 
diff --git a/couchpotato/core/_base/updater/main.py b/couchpotato/core/_base/updater/main.py
index c12c4b9f..eacc993a 100644
--- a/couchpotato/core/_base/updater/main.py
+++ b/couchpotato/core/_base/updater/main.py
@@ -55,7 +55,7 @@ class Updater(Plugin):
         if self.updater.check():
             if self.conf('automatic') and not self.updater.update_failed:
                 if self.updater.doUpdate():
-                    fireEventAsync('app.crappy_restart')
+                    fireEventAsync('app.restart')
             else:
                 if self.conf('notification'):
                     fireEvent('updater.available', message = 'A new update is available', data = self.updater.info())
diff --git a/couchpotato/runner.py b/couchpotato/runner.py
index fd7ba8e6..e2b5bdf9 100644
--- a/couchpotato/runner.py
+++ b/couchpotato/runner.py
@@ -46,7 +46,7 @@ def getOptions(base_path, args):
 
 
 def cleanup():
-    fireEvent('app.crappy_shutdown', single = True)
+    fireEvent('app.shutdown', single = True)
     time.sleep(1)
 
 # Tornado monkey patch logging..