diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php
index 3ee4261..a98b833 100644
--- a/.phpstorm.meta.php
+++ b/.phpstorm.meta.php
@@ -2,9 +2,9 @@
 namespace PHPSTORM_META
 {
 
-    use Musoka\Zap\Application;
+    use CrocWork\Zappy\Application;
 
     override(Application::get(), map([
-        'router' => Musoka\Zap\Routing\Router::class
+        'router' => CrocWork\Zappy\Routing\Router::class
     ]));
 }
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 64506df..203847e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "crocwork/zappy-base",
-    "description": "PHP microframework for Musoka projects.",
+    "description": "Zappy PHP MicroFramework for quick projects.",
     "type": "library",
     "license": "MIT",
     "autoload": {
@@ -8,13 +8,13 @@
             "src/helpers.php"
         ],
         "psr-4": {
-            "Musoka\\Zap\\": "src/"
+            "CrocWork\\Zappy\\": "src/"
         }
     },
     "authors": [
         {
             "name": "Fristi",
-            "email": "support@musoka.network"
+            "email": "fristi@subcon.town"
         }
     ],
     "minimum-stability": "stable",
diff --git a/src/Application.php b/src/Application.php
index 6027aa9..9ebd3db 100644
--- a/src/Application.php
+++ b/src/Application.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Musoka\Zap;
+namespace CrocWork\Zappy;
 
-use Musoka\Zap\Components\ComponentAggregator;
-use Musoka\Zap\Components\ComponentProviderInterface;
-use Musoka\Zap\Config\ConfigRepository;
-use Musoka\Zap\ErrorHandling\Handler;
-use Musoka\Zap\View\Renderable;
-use Musoka\Zap\Http\Request;
-use Musoka\Zap\Http\Response;
+use CrocWork\Zappy\Components\ComponentAggregator;
+use CrocWork\Zappy\Components\ComponentProviderInterface;
+use CrocWork\Zappy\Config\ConfigRepository;
+use CrocWork\Zappy\ErrorHandling\Handler;
+use CrocWork\Zappy\View\Renderable;
+use CrocWork\Zappy\Http\Request;
+use CrocWork\Zappy\Http\Response;
 
 
 /**
diff --git a/src/Components/AbstractComponentProvider.php b/src/Components/AbstractComponentProvider.php
index ed9f7eb..a2f2676 100644
--- a/src/Components/AbstractComponentProvider.php
+++ b/src/Components/AbstractComponentProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Musoka\Zap\Components;
+namespace CrocWork\Zappy\Components;
 
 abstract class AbstractComponentProvider implements ComponentProviderInterface
 {
diff --git a/src/Components/BootableProviderInterface.php b/src/Components/BootableProviderInterface.php
index 322643d..bfe0174 100644
--- a/src/Components/BootableProviderInterface.php
+++ b/src/Components/BootableProviderInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Musoka\Zap\Components;
+namespace CrocWork\Zappy\Components;
 
 interface BootableProviderInterface extends ComponentProviderInterface
 {
diff --git a/src/Components/ComponentAggregator.php b/src/Components/ComponentAggregator.php
index 6761454..993920d 100644
--- a/src/Components/ComponentAggregator.php
+++ b/src/Components/ComponentAggregator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Musoka\Zap\Components;
+namespace CrocWork\Zappy\Components;
 
 class ComponentAggregator
 {
diff --git a/src/Components/ComponentProviderInterface.php b/src/Components/ComponentProviderInterface.php
index 809ea55..47e0cdd 100644
--- a/src/Components/ComponentProviderInterface.php
+++ b/src/Components/ComponentProviderInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Musoka\Zap\Components;
+namespace CrocWork\Zappy\Components;
 
 interface ComponentProviderInterface
 {
diff --git a/src/Config/ConfigRepository.php b/src/Config/ConfigRepository.php
index ea5cec1..6e7efcd 100644
--- a/src/Config/ConfigRepository.php
+++ b/src/Config/ConfigRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Musoka\Zap\Config;
+namespace CrocWork\Zappy\Config;
 
 class ConfigRepository
 {
diff --git a/src/DIContainer.php b/src/DIContainer.php
index f267076..6b61fa3 100644
--- a/src/DIContainer.php
+++ b/src/DIContainer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Musoka\Zap;
+namespace CrocWork\Zappy;
 
 class DIContainer
 {
diff --git a/src/ErrorHandling/Handler.php b/src/ErrorHandling/Handler.php
index 5594c6c..2e68d5e 100644
--- a/src/ErrorHandling/Handler.php
+++ b/src/ErrorHandling/Handler.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Musoka\Zap\ErrorHandling;
+namespace CrocWork\Zappy\ErrorHandling;
 
-use Musoka\Zap\Application;
+use CrocWork\Zappy\Application;
 
 class Handler
 {
diff --git a/src/Helpers/translator.php b/src/Helpers/translator.php
index 87cf131..2fa500d 100644
--- a/src/Helpers/translator.php
+++ b/src/Helpers/translator.php
@@ -1,6 +1,6 @@
 <?php
 if(!function_exists('translator')) {
-    function translator(): \Musoka\Zap\I18n\Translator
+    function translator(): \CrocWork\Zappy\I18n\Translator
     {
         return app()->get('translator');
     }
diff --git a/src/Helpers/views.php b/src/Helpers/views.php
index e7105d4..df2864d 100644
--- a/src/Helpers/views.php
+++ b/src/Helpers/views.php
@@ -1,6 +1,6 @@
 <?php
 if(!function_exists('view')) {
-    function view(string $view, array $data = []): \Musoka\Zap\View\View
+    function view(string $view, array $data = []): \CrocWork\Zappy\View\View
     {
         $factory = app()->get('view');
         if($factory) {
diff --git a/src/Http/Request.php b/src/Http/Request.php
index cfc938b..ac22262 100644
--- a/src/Http/Request.php
+++ b/src/Http/Request.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Musoka\Zap\Http;
+namespace CrocWork\Zappy\Http;
 
 use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
 
diff --git a/src/Http/Response.php b/src/Http/Response.php
index 7d9cc25..f7811f9 100644
--- a/src/Http/Response.php
+++ b/src/Http/Response.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Musoka\Zap\Http;
+namespace CrocWork\Zappy\Http;
 
 class Response extends \Symfony\Component\HttpFoundation\Response
 {
diff --git a/src/I18n/I18nProvider.php b/src/I18n/I18nProvider.php
index 19f62e4..fec6aa3 100644
--- a/src/I18n/I18nProvider.php
+++ b/src/I18n/I18nProvider.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Musoka\Zap\I18n;
+namespace CrocWork\Zappy\I18n;
 
-use Musoka\Zap\Components\AbstractComponentProvider;
-use Musoka\Zap\Components\ComponentAggregator;
+use CrocWork\Zappy\Components\AbstractComponentProvider;
+use CrocWork\Zappy\Components\ComponentAggregator;
 
 class I18nProvider extends AbstractComponentProvider
 {
diff --git a/src/I18n/Translator.php b/src/I18n/Translator.php
index e12e565..8f45c18 100644
--- a/src/I18n/Translator.php
+++ b/src/I18n/Translator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Musoka\Zap\I18n;
+namespace CrocWork\Zappy\I18n;
 
 /**
  * Translator class
diff --git a/src/Routing/IsRepository.php b/src/Routing/IsRepository.php
index 663c878..3885a23 100644
--- a/src/Routing/IsRepository.php
+++ b/src/Routing/IsRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Musoka\Zap\Routing;
+namespace CrocWork\Zappy\Routing;
 
 trait IsRepository
 {
diff --git a/src/Routing/LocalizedRepository.php b/src/Routing/LocalizedRepository.php
index 88473c0..03a6ba0 100644
--- a/src/Routing/LocalizedRepository.php
+++ b/src/Routing/LocalizedRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Musoka\Zap\Routing;
+namespace CrocWork\Zappy\Routing;
 
 class LocalizedRepository extends Repository
 {
diff --git a/src/Routing/LocalizedRoute.php b/src/Routing/LocalizedRoute.php
index a469a01..ce33a1c 100644
--- a/src/Routing/LocalizedRoute.php
+++ b/src/Routing/LocalizedRoute.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Musoka\Zap\Routing;
+namespace CrocWork\Zappy\Routing;
 
 class LocalizedRoute extends Route
 {
diff --git a/src/Routing/Repository.php b/src/Routing/Repository.php
index 3cce944..61206ad 100644
--- a/src/Routing/Repository.php
+++ b/src/Routing/Repository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Musoka\Zap\Routing;
+namespace CrocWork\Zappy\Routing;
 
 class Repository
 {
diff --git a/src/Routing/Route.php b/src/Routing/Route.php
index 76b4917..11053dd 100644
--- a/src/Routing/Route.php
+++ b/src/Routing/Route.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Musoka\Zap\Routing;
+namespace CrocWork\Zappy\Routing;
 
 class Route
 {
diff --git a/src/Routing/RouteGroup.php b/src/Routing/RouteGroup.php
index ce3bf73..00e9c25 100644
--- a/src/Routing/RouteGroup.php
+++ b/src/Routing/RouteGroup.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Musoka\Zap\Routing;
+namespace CrocWork\Zappy\Routing;
 
 class RouteGroup
 {
diff --git a/src/Routing/RouteRepository.php b/src/Routing/RouteRepository.php
index 9f066a8..a815f69 100644
--- a/src/Routing/RouteRepository.php
+++ b/src/Routing/RouteRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Musoka\Zap\Routing;
+namespace CrocWork\Zappy\Routing;
 
 class RouteRepository
 {
diff --git a/src/Routing/Router.php b/src/Routing/Router.php
index e77abfc..20d4df9 100644
--- a/src/Routing/Router.php
+++ b/src/Routing/Router.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Musoka\Zap\Routing;
+namespace CrocWork\Zappy\Routing;
 
-use Musoka\Zap\Application;
+use CrocWork\Zappy\Application;
 use Symfony\Component\HttpFoundation\HeaderBag;
-use Musoka\Zap\Http\Request;
+use CrocWork\Zappy\Http\Request;
 
 class Router implements RouterInterface
 {
diff --git a/src/Routing/RouterInterface.php b/src/Routing/RouterInterface.php
index 4e69933..d1275fb 100644
--- a/src/Routing/RouterInterface.php
+++ b/src/Routing/RouterInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Musoka\Zap\Routing;
+namespace CrocWork\Zappy\Routing;
 
 interface RouterInterface
 {
diff --git a/src/Routing/RouterProvider.php b/src/Routing/RouterProvider.php
index 917e9b4..54a53d2 100644
--- a/src/Routing/RouterProvider.php
+++ b/src/Routing/RouterProvider.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Musoka\Zap\Routing;
+namespace CrocWork\Zappy\Routing;
 
-use Musoka\Zap\Components\AbstractComponentProvider;
-use Musoka\Zap\Components\ComponentAggregator;
+use CrocWork\Zappy\Components\AbstractComponentProvider;
+use CrocWork\Zappy\Components\ComponentAggregator;
 
 class RouterProvider extends AbstractComponentProvider
 {
diff --git a/src/Routing/UrlGenerator.php b/src/Routing/UrlGenerator.php
index c10f7e9..08d555c 100644
--- a/src/Routing/UrlGenerator.php
+++ b/src/Routing/UrlGenerator.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Musoka\Zap\Routing;
+namespace CrocWork\Zappy\Routing;
 
-use Musoka\Zap\I18n\Translator;
+use CrocWork\Zappy\I18n\Translator;
 use Symfony\Component\HttpFoundation\Request;
 
 class UrlGenerator
diff --git a/src/View/Renderable.php b/src/View/Renderable.php
index d9068ce..2e22940 100644
--- a/src/View/Renderable.php
+++ b/src/View/Renderable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Musoka\Zap\View;
+namespace CrocWork\Zappy\View;
 
 interface Renderable
 {
diff --git a/src/View/View.php b/src/View/View.php
index 104396f..5c3be03 100644
--- a/src/View/View.php
+++ b/src/View/View.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Musoka\Zap\View;
+namespace CrocWork\Zappy\View;
 
 enum SectionMode {
     case OVERWRITE;
diff --git a/src/View/ViewFactory.php b/src/View/ViewFactory.php
index 68aced3..3d95176 100644
--- a/src/View/ViewFactory.php
+++ b/src/View/ViewFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Musoka\Zap\View;
+namespace CrocWork\Zappy\View;
 
 class ViewFactory
 {
diff --git a/src/View/ViewProvider.php b/src/View/ViewProvider.php
index 5aaf1af..c8a3fc4 100644
--- a/src/View/ViewProvider.php
+++ b/src/View/ViewProvider.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Musoka\Zap\View;
+namespace CrocWork\Zappy\View;
 
-use Musoka\Zap\Components\AbstractComponentProvider;
-use Musoka\Zap\Components\ComponentAggregator;
+use CrocWork\Zappy\Components\AbstractComponentProvider;
+use CrocWork\Zappy\Components\ComponentAggregator;
 
 class ViewProvider extends AbstractComponentProvider
 {
diff --git a/src/helpers.php b/src/helpers.php
index 704b219..4b0faed 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -1,9 +1,9 @@
 <?php
 
 if(!function_exists('app')) {
-    function app(): ?\Musoka\Zap\Application
+    function app(): ?\CrocWork\Zappy\Application
     {
-        return \Musoka\Zap\Application::getInstance();
+        return \CrocWork\Zappy\Application::getInstance();
     }
 }