diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php
index 4ef98c212..8128618af 100644
--- a/framework/src/Maveriks/WebApplication.php
+++ b/framework/src/Maveriks/WebApplication.php
@@ -353,7 +353,7 @@ class WebApplication
             $tmp = array_shift($tmp);
             $tmp = explode('-', $tmp);
             $pluginName = $tmp[1];
-            $uri = str_replace('/plugin-'.$pluginName, '', $uri);
+            $uri = str_replace('plugin-'.$pluginName, strtolower($pluginName), $uri);
         }
         
         // hook to get rest api classes from plugins
@@ -370,7 +370,7 @@ class WebApplication
                     
                     foreach ($plugin as $class) {
                         if (class_exists($class['namespace'])) {
-                            $this->rest->addAPIClass($class['namespace']);
+                            $this->rest->addAPIClass($class['namespace'], strtolower($pluginName));
                         }             
                     }                    
                 }
diff --git a/workflow/engine/classes/class.pluginRegistry.php b/workflow/engine/classes/class.pluginRegistry.php
index f5b500953..e6f77843f 100755
--- a/workflow/engine/classes/class.pluginRegistry.php
+++ b/workflow/engine/classes/class.pluginRegistry.php
@@ -1408,7 +1408,7 @@ class PMPluginRegistry
 
                 // Ensure that is registering only existent classes.
                 if (class_exists($ns)) {
-                    $this->_restServices[strtolower($sNamespace)][] = array(
+                    $this->_restServices[$sNamespace][] = array(
                         "filepath" => $classFile,
                         "namespace" => $ns
                     );