diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 19000b756..ebb5ef16c 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -79,8 +79,8 @@
         <testsuite name="Narrowspark Middleware Component Test Suite">
             <directory>./src/Viserio/Middleware/Tests</directory>
         </testsuite>
-        <testsuite name="Narrowspark Notifynder Component Test Suite">
-            <directory>./src/Viserio/Notifynder/Tests</directory>
+        <testsuite name="Narrowspark Notify Component Test Suite">
+            <directory>./src/Viserio/Notify/Tests</directory>
         </testsuite>
         <testsuite name="Narrowspark Parsers Component Test Suite">
             <directory>./src/Viserio/Parsers/Tests</directory>
diff --git a/src/Viserio/Contracts/Notify/Factory.php b/src/Viserio/Contracts/Notify/Factory.php
new file mode 100644
index 000000000..85be7fea5
--- /dev/null
+++ b/src/Viserio/Contracts/Notify/Factory.php
@@ -0,0 +1,7 @@
+<?php
+namespace Viserio\Contracts\Notify;
+
+interface Factory
+{
+
+}
diff --git a/src/Viserio/Contracts/Notifynder/Factory.php b/src/Viserio/Contracts/Notifynder/Factory.php
deleted file mode 100644
index bffe1ceeb..000000000
--- a/src/Viserio/Contracts/Notifynder/Factory.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-namespace Viserio\Contracts\Notifynder;
-
-interface Factory
-{
-
-}
diff --git a/src/Viserio/Notifynder/LICENSE b/src/Viserio/Notify/LICENSE
similarity index 100%
rename from src/Viserio/Notifynder/LICENSE
rename to src/Viserio/Notify/LICENSE
diff --git a/src/Viserio/Notifynder/NotifynderManager.php b/src/Viserio/Notify/NotifyManager.php
similarity index 100%
rename from src/Viserio/Notifynder/NotifynderManager.php
rename to src/Viserio/Notify/NotifyManager.php
diff --git a/src/Viserio/Notifynder/README.md b/src/Viserio/Notify/README.md
similarity index 96%
rename from src/Viserio/Notifynder/README.md
rename to src/Viserio/Notify/README.md
index 84f83f3e1..92ac31818 100644
--- a/src/Viserio/Notifynder/README.md
+++ b/src/Viserio/Notify/README.md
@@ -1,4 +1,4 @@
-# Viserio Notifynder package
+# Viserio Notify package
 
 This package is part of the [Narrowspark framework](http://github.com/narrowspark/framework).
 
@@ -21,7 +21,7 @@ Thank you for considering contributing to the Narrowspark framework! The contrib
 Use [Composer](https://getcomposer.org/) to install this package:
 
 ```sh
-composer require viserio/notifynder
+composer require viserio/notify
 ```
 
 ## Official Documentation
diff --git a/src/Viserio/Notifynder/composer.json b/src/Viserio/Notify/composer.json
similarity index 82%
rename from src/Viserio/Notifynder/composer.json
rename to src/Viserio/Notify/composer.json
index db2ba80c7..2ce084704 100644
--- a/src/Viserio/Notifynder/composer.json
+++ b/src/Viserio/Notify/composer.json
@@ -1,13 +1,13 @@
 {
-    "name"       : "viserio/notifynder",
+    "name"       : "viserio/notify",
     "type"       : "library",
-    "description": "The Viserio Notifynder package.",
+    "description": "The Viserio Notify package.",
     "keywords"   : [
         "narrowspark",
         "viserio",
     ],
     "license"    : "MIT",
-    "homepage"   : "http://github.com/narrowspark/notifynder",
+    "homepage"   : "http://github.com/narrowspark/notify",
     "support"    : {
         "issues": "https://github.com/narrowspark/framework/issues",
         "source": "https://github.com/narrowspark/framework"
@@ -35,12 +35,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Viserio\\Notifynder\\"          : ""
+            "Viserio\\Notify\\"          : ""
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Viserio\\Notifynder\\Tests\\"   : "Tests/"
+            "Viserio\\Notify\\Tests\\"   : "Tests/"
         }
     },
     "extra": {