diff --git a/Application/Core/TinyMCE/Loader.php b/Application/Core/TinyMCE/Loader.php
index 2d98fe2..3384628 100644
--- a/Application/Core/TinyMCE/Loader.php
+++ b/Application/Core/TinyMCE/Loader.php
@@ -142,7 +142,7 @@ class Loader
         $aInclude = (array) Registry::getConfig()->getGlobalParameter('includes' . $sSuffix);
 
         $aInclude[3][] = Registry::getConfig()->getActiveView()->getViewConfig()->getModuleUrl(
-            'tinymce-editor',
+            'o3-tinymce-editor',
             'out/tinymce/tinymce.min.js'
         );
 
diff --git a/Application/Core/TinyMCE/Plugins/FullScreen.php b/Application/Core/TinyMCE/Plugins/FullScreen.php
index aa4f7da..2c083a9 100644
--- a/Application/Core/TinyMCE/Plugins/FullScreen.php
+++ b/Application/Core/TinyMCE/Plugins/FullScreen.php
@@ -47,7 +47,7 @@ class FullScreen extends AbstractPlugin
     public function getScriptPath(): ?string
     {
         return Registry::getConfig()->getActiveView()->getViewConfig()->getModuleUrl(
-            'tinymce-editor',
+            'o3-tinymce-editor',
             'out/plugins/oxfullscreen/plugin.js'
         );
     }
diff --git a/Application/Core/TinyMCE/Plugins/Roxy.php b/Application/Core/TinyMCE/Plugins/Roxy.php
index b8659b8..0638104 100644
--- a/Application/Core/TinyMCE/Plugins/Roxy.php
+++ b/Application/Core/TinyMCE/Plugins/Roxy.php
@@ -40,7 +40,7 @@ class Roxy extends AbstractPlugin
     public function getScriptPath(): ?string
     {
         return Registry::getConfig()->getActiveView()->getViewConfig()->getModuleUrl(
-            'tinymce-editor',
+            'o3-tinymce-editor',
             'out/plugins/roxy/plugin.js'
         );
     }
diff --git a/Application/views/admin/filemanager.tpl b/Application/views/admin/filemanager.tpl
index 11a67ec..a6e9f9c 100755
--- a/Application/views/admin/filemanager.tpl
+++ b/Application/views/admin/filemanager.tpl
@@ -23,15 +23,15 @@
   Contact: Lyubomir Arsov, liubo (at) web-lobby.com
 -->
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<base href='[{$oViewConf->getModuleUrl("tinymce-editor","Application/fileman/")}]'>
+<base href='[{$oViewConf->getModuleUrl("o3-tinymce-editor","Application/fileman/")}]'>
 <title>Roxy File Manager</title>
-<link href='[{$oViewConf->getModuleUrl("tinymce-editor","Application/fileman/css/jquery-ui-1.10.4.custom.min.css")}]' rel="stylesheet" type="text/css" />
-<link href='[{$oViewConf->getModuleUrl("tinymce-editor","Application/fileman/css/main.min.css")}]' rel="stylesheet" type="text/css" />
-<script type="text/javascript" src='[{$oViewConf->getModuleUrl("tinymce-editor","Application/fileman/js/jquery-1.11.1.min.js")}]'></script>
-<script type="text/javascript" src='[{$oViewConf->getModuleUrl("tinymce-editor","Application/fileman/js/jquery-ui-1.10.4.custom.min.js")}]'></script>
-<script type="text/javascript" src='[{$oViewConf->getModuleUrl("tinymce-editor","Application/fileman/js/custom.js")}]'></script>
-<script type="text/javascript" src='[{$oViewConf->getModuleUrl("tinymce-editor","Application/fileman/js/main.min.js")}]'></script>
-<script type="text/javascript" src='[{$oViewConf->getModuleUrl("tinymce-editor","Application/fileman/js/jquery-dateFormat.min.js")}]'></script>
+<link href='[{$oViewConf->getModuleUrl("o3-tinymce-editor","Application/fileman/css/jquery-ui-1.10.4.custom.min.css")}]' rel="stylesheet" type="text/css" />
+<link href='[{$oViewConf->getModuleUrl("o3-tinymce-editor","Application/fileman/css/main.min.css")}]' rel="stylesheet" type="text/css" />
+<script type="text/javascript" src='[{$oViewConf->getModuleUrl("o3-tinymce-editor","Application/fileman/js/jquery-1.11.1.min.js")}]'></script>
+<script type="text/javascript" src='[{$oViewConf->getModuleUrl("o3-tinymce-editor","Application/fileman/js/jquery-ui-1.10.4.custom.min.js")}]'></script>
+<script type="text/javascript" src='[{$oViewConf->getModuleUrl("o3-tinymce-editor","Application/fileman/js/custom.js")}]'></script>
+<script type="text/javascript" src='[{$oViewConf->getModuleUrl("o3-tinymce-editor","Application/fileman/js/main.min.js")}]'></script>
+<script type="text/javascript" src='[{$oViewConf->getModuleUrl("o3-tinymce-editor","Application/fileman/js/jquery-dateFormat.min.js")}]'></script>
 </head>
 <body>
 <style>
diff --git a/metadata.php b/metadata.php
index 8a5b815..2d2e5a0 100755
--- a/metadata.php
+++ b/metadata.php
@@ -21,7 +21,7 @@
 
 $sMetadataVersion = '2.1';
 $aModule = [
-    'id' => 'tinymce-editor',
+    'id' => 'o3-tinymce-editor',
     'title' => 'TinyMCE Editor',
     'description' => 'TinyMCE 6 Integration for O3-Shop',
     'thumbnail' => 'logo.png',