diff --git a/composer.json b/composer.json
index 7b4e780..030bf42 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
     "autoload": {
         "files": ["src/functions.php"],
         "psr-4": {
-            "Joop\\Asynchronous\\": ["src"]
+            "JoopSchilder\\Asynchronous\\": ["src"]
         }
     },
     "require": {
diff --git a/src/Asynchronous.php b/src/Asynchronous.php
index 6d1957d..c6a8760 100644
--- a/src/Asynchronous.php
+++ b/src/Asynchronous.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Joop\Asynchronous;
+namespace JoopSchilder\Asynchronous;
 
 /**
  * Class Asynchronous
@@ -128,7 +128,7 @@ class Asynchronous
 	/**
 	 *
 	 */
-	public static function removedShmBlock()
+	public static function removeShmBlock()
 	{
 		$instance = self::getInstance();
 		if (is_resource($instance->shm)) {
@@ -232,19 +232,20 @@ class Asynchronous
 				return;
 
 			self::awaitChildren();
-			self::removedShmBlock();
+			self::removeShmBlock();
 		});
 
 		/*
 		 * The signal handler
 		 */
-		foreach([SIGINT, SIGTERM, SIGUSR1] as $signal)
+		foreach([SIGHUP, SIGINT, SIGQUIT, SIGKILL, SIGTERM] as $signal)
 			pcntl_signal($signal, function($s) use (&$instance) {
 				if ($instance->isChild)
 					return;
+
 				self::killChildren();
 				self::awaitChildren();
-				self::removedShmBlock();
+				self::removeShmBlock();
 			});
 
 	}
diff --git a/src/Promise.php b/src/Promise.php
index e477453..0f4937e 100644
--- a/src/Promise.php
+++ b/src/Promise.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Joop\Asynchronous;
+namespace JoopSchilder\Asynchronous;
 
 class Promise
 {
diff --git a/src/functions.php b/src/functions.php
index a79405b..2493bd8 100644
--- a/src/functions.php
+++ b/src/functions.php
@@ -1,6 +1,7 @@
 <?php
 
-namespace Joop\Asynchronous;
+namespace JoopSchilder\Asynchronous;
+
 
 if (!function_exists('async_run')) {