diff --git a/app/views/console/home/index.phtml b/app/views/console/home/index.phtml
index 2e3c7f5577..94840fb9d3 100644
--- a/app/views/console/home/index.phtml
+++ b/app/views/console/home/index.phtml
@@ -5,7 +5,8 @@ $graph = $this->getParam('graph', false);
 <div class="cover margin-bottom-small">
     <div class="zone xl margin-bottom-large margin-top-small">
         <h1 class="margin-bottom-small">
-            <span class="title" data-ls-bind="{{console-project.name}}">&nbsp;</span>&nbsp;&nbsp;<!--<span class="tag focus" style="vertical-align: middle">Beta Plan</span>-->
+            <span class="title" data-ls-bind="{{console-project.name}}">&nbsp;</span>&nbsp;&nbsp;
+            <!--<span class="tag focus" style="vertical-align: middle">Beta Plan</span>-->
         </h1>
 
         <ul class="margin-top margin-bottom-large clear">
@@ -19,16 +20,9 @@ $graph = $this->getParam('graph', false);
 
 <div class="zone xxl margin-top-negative-large">
     <div>
-        <div class="box margin-bottom dashboard"
-             data-service="projects.getProjectUsage"
-             data-event="load"
-             data-name="usage"
-             data-param-project-id="{{router.params.project}}"
-             data-success="render,trigger"
-             data-error="render"
-             data-success-triggers="usage.load">
+        <div class="box margin-bottom dashboard" data-service="projects.getProjectUsage" data-event="load" data-name="usage" data-param-project-id="{{router.params.project}}" data-success="render,trigger" data-error="render" data-success-triggers="usage.load">
 
-            <?php if(!$graph): ?>
+            <?php if (!$graph) : ?>
                 <div class="row responsive">
                     <div class="col span-9">
                         <div class="pull-start margin-end">
@@ -94,16 +88,7 @@ $graph = $this->getParam('graph', false);
                     <div xdata-ls-template="template-{{platform.type}}-update" data-type="script"></div>
                 </div>
 
-                <form class="pull-end margin-end"
-                      data-service="projects.platforms.delete"
-                      data-scope="console"
-                      data-event="submit"
-                      data-confirm="Are you sure you want to delete this platform?"
-                      data-success="alert,trigger"
-                      data-success-alert="Deleted platform successfully"
-                      data-success-triggers="platform.delete"
-                      data-error="alert"
-                      data-error-alert="Failed to delete platform">
+                <form class="pull-end margin-end" data-service="projects.deletePlatform" data-scope="console" data-event="submit" data-confirm="Are you sure you want to delete this platform?" data-success="alert,trigger" data-success-alert="Deleted platform successfully" data-success-triggers="platform.delete" data-error="alert" data-error-alert="Failed to delete platform">
 
                     <input type="hidden" name="projectId" data-ls-bind="{{console-project.$uid}}">
                     <input type="hidden" name="platformId" data-ls-bind="{{platform.$uid}}">
@@ -154,14 +139,7 @@ $graph = $this->getParam('graph', false);
 
     <h1>New Website</h1>
 
-    <form data-service="projects.platforms.create"
-          data-scope="console"
-          data-event="submit"
-          data-success="alert,trigger,reset"
-          data-success-alert="Created new platform successfully"
-          data-success-triggers="platform.new,modal-close"
-          data-error="alert"
-          data-error-alert="Failed to create platform">
+    <form data-service="projects.createPlatform" data-scope="console" data-event="submit" data-success="alert,trigger,reset" data-success-alert="Created new platform successfully" data-success-triggers="platform.new,modal-close" data-error="alert" data-error-alert="Failed to create platform">
 
         <input type="hidden" name="projectId" data-ls-bind="{{console-project.$uid}}">
         <input type="hidden" name="type" data-ls-bind="web">
@@ -203,14 +181,7 @@ $graph = $this->getParam('graph', false);
 </div>
 
 <script type="text/html" id="template-web-update">
-    <form data-service="projects.platforms.update"
-          data-scope="console"
-          data-event="submit"
-          data-success="alert,trigger,reset"
-          data-success-alert="Updated platform successfully"
-          data-success-triggers="platform.update,modal-close"
-          data-error="alert"
-          data-error-alert="Failed to update platform">
+    <form data-service="projects.updatePlatform" data-scope="console" data-event="submit" data-success="alert,trigger,reset" data-success-alert="Updated platform successfully" data-success-triggers="platform.update,modal-close" data-error="alert" data-error-alert="Failed to update platform">
 
         <input type="hidden" name="projectId" data-ls-bind="{{console-project.$uid}}">
         <input type="hidden" name="platformId" data-ls-bind="{{platform.$uid}}">
diff --git a/app/views/console/keys/index.phtml b/app/views/console/keys/index.phtml
index 9a573ddff1..e8826dbfea 100644
--- a/app/views/console/keys/index.phtml
+++ b/app/views/console/keys/index.phtml
@@ -31,7 +31,7 @@ $scopes = [ // TODO sync with project list
         <?php echo Locale::getText('console.keys.title'); ?>
     </h1>
 </div>
-<div class="zone xl" data-service="projects.keys.list" data-scope="console" data-event="load" data-name="console-keys" data-param-project-id="{{router.params.project}}" data-success="render,trigger" data-success-rerender="key.new,key.update,key.delete" data-success-triggers="project.load" data-error="render" data-error-rerender="">
+<div class="zone xl" data-service="projects.listKeys" data-scope="console" data-event="load" data-name="console-keys" data-param-project-id="{{router.params.project}}" data-success="render,trigger" data-success-rerender="key.new,key.update,key.delete" data-success-triggers="project.load" data-error="render" data-error-rerender="">
 
     <div data-ls-if="0 == {{console-keys.length}} || undefined == {{console-keys.length}}" class="box margin-top margin-bottom" style="display: none;">
         <h3 class="margin-bottom-small">No API Keys Found</h3>
@@ -47,7 +47,7 @@ $scopes = [ // TODO sync with project list
 
                     <h1>Update API Key</h1>
 
-                    <form data-service="projects.keys.update" data-scope="console" data-event="submit" data-success="alert,trigger,reset" data-success-alert="Updated API key successfully" data-success-triggers="key.update,modal-close" data-error="alert" data-error-alert="Failed to update API key">
+                    <form data-service="projects.updateKey" data-scope="console" data-event="submit" data-success="alert,trigger,reset" data-success-alert="Updated API key successfully" data-success-triggers="key.update,modal-close" data-error="alert" data-error-alert="Failed to update API key">
 
                         <input type="hidden" name="projectId" data-ls-bind="{{console-project.$uid}}">
                         <input type="hidden" name="keyId" data-ls-bind="{{key.$uid}}">
@@ -75,7 +75,7 @@ $scopes = [ // TODO sync with project list
                     </form>
                 </div>
 
-                <form class="pull-end margin-end" data-service="projects.keys.delete" data-scope="console" data-event="submit" data-confirm="Are you sure you want to delete this API key?" data-success="alert,trigger" data-success-alert="Deleted API key successfully" data-success-triggers="key.delete" data-error="alert" data-error-alert="Failed to delete API key">
+                <form class="pull-end margin-end" data-service="projects.deleteKey" data-scope="console" data-event="submit" data-confirm="Are you sure you want to delete this API key?" data-success="alert,trigger" data-success-alert="Deleted API key successfully" data-success-triggers="key.delete" data-error="alert" data-error-alert="Failed to delete API key">
 
                     <input type="hidden" name="projectId" data-ls-bind="{{console-project.$uid}}">
                     <input type="hidden" name="keyId" data-ls-bind="{{key.$uid}}">
@@ -109,7 +109,7 @@ $scopes = [ // TODO sync with project list
 
             <h1>Add API Keys</h1>
 
-            <form data-service="projects.keys.create" data-scope="console" data-event="submit" data-success="alert,trigger,reset" data-success-alert="Created API key successfully" data-success-triggers="key.new,modal-close" data-error="alert" data-error-alert="Failed to create API key">
+            <form data-service="projects.createKey" data-scope="console" data-event="submit" data-success="alert,trigger,reset" data-success-alert="Created API key successfully" data-success-triggers="key.new,modal-close" data-error="alert" data-error-alert="Failed to create API key">
 
                 <input type="hidden" name="projectId" data-ls-bind="{{console-project.$uid}}">
 
diff --git a/app/views/console/settings/index.phtml b/app/views/console/settings/index.phtml
index d113741bb0..bd5decdd04 100644
--- a/app/views/console/settings/index.phtml
+++ b/app/views/console/settings/index.phtml
@@ -17,7 +17,7 @@ use Utopia\Locale\Locale;
             <li data-state="/console/settings?project={{router.params.project}}">
                 <h2><?php echo Locale::getText('console.settings.section.overview.title'); ?></h2>
 
-                <form data-service="projects.update" data-scope="console" data-event="submit" data-param-project-id="{{router.params.project}}" data-success="alert,trigger" data-success-alert="Saved project successfully" data-success-triggers="project.update" data-error="alert" data-error-alert="Failed to update project">
+                <form data-service="projects.updateProject" data-scope="console" data-event="submit" data-param-project-id="{{router.params.project}}" data-success="alert,trigger" data-success-alert="Saved project successfully" data-success-triggers="project.update" data-error="alert" data-error-alert="Failed to update project">
 
                     <input name="$uid" type="hidden" data-ls-bind="{{console-project.$uid}}" />
 
@@ -87,7 +87,7 @@ use Utopia\Locale\Locale;
             </li>
             <li data-state="/console/settings/privacy?project={{router.params.project}}">
 
-                <form data-service="projects.update" data-scope="console" data-event="submit" data-param-project-id="{{router.params.project}}" data-success="alert,trigger" data-success-alert="Saved project successfully" data-success-triggers="project.update" data-error="alert" data-error-alert="Failed to update project">
+                <form data-service="projects.updateProject" data-scope="console" data-event="submit" data-param-project-id="{{router.params.project}}" data-success="alert,trigger" data-success-alert="Saved project successfully" data-success-triggers="project.update" data-error="alert" data-error-alert="Failed to update project">
                     <h2>Privacy & Legal</h2>
 
                     <div class="box margin-bottom">
@@ -124,7 +124,7 @@ use Utopia\Locale\Locale;
             <li data-state="/console/settings/members?project={{router.params.project}}">
                 <h2><?php echo Locale::getText('console.settings.section.members.title'); ?></h2>
 
-                <div class="zone xl" data-service="teams.getMembers" data-scope="console" data-event="load,auth.invite,auth.leave" data-name="members" data-param-team-id="{{console-project.teamId}}" data-success="render,trigger" data-success-triggers="members.load" data-error="render" data-error-rerender="">
+                <div class="zone xl" data-service="teams.getTeamMembers" data-scope="console" data-event="load,auth.invite,auth.leave" data-name="members" data-param-team-id="{{console-project.teamId}}" data-success="render,trigger" data-success-triggers="members.load" data-error="render" data-error-rerender="">
 
                     <div class="box margin-bottom">
                         <ul data-ls-loop="members" data-ls-as="member" class="list">
diff --git a/app/views/console/tasks/index.phtml b/app/views/console/tasks/index.phtml
index 4bb039d43d..aa30fdd743 100644
--- a/app/views/console/tasks/index.phtml
+++ b/app/views/console/tasks/index.phtml
@@ -8,7 +8,7 @@ use Utopia\Locale\Locale;
         <?php echo Locale::getText('console.tasks.title'); ?>
     </h1>
 </div>
-<div class="zone xl" data-service="projects.tasks.list" data-scope="console" data-event="load" data-name="console-tasks" data-param-project-id="{{router.params.project}}" data-success="render,trigger" data-success-rerender="task.new,task.update,task.delete" data-success-triggers="project.load" data-error="render" data-error-rerender="">
+<div class="zone xl" data-service="projects.listTasks" data-scope="console" data-event="load" data-name="console-tasks" data-param-project-id="{{router.params.project}}" data-success="render,trigger" data-success-rerender="task.new,task.update,task.delete" data-success-triggers="project.load" data-error="render" data-error-rerender="">
 
     <div data-ls-if="0 === {{console-tasks.length}} || undefined === {{console-tasks.length}}" class="box margin-top margin-bottom" style="display: none;">
         <h3 class="margin-bottom-small">No Tasks Found</h3>
@@ -72,7 +72,7 @@ use Utopia\Locale\Locale;
 
                             <h1>Update Task</h1>
 
-                            <form data-service="projects.tasks.update" data-scope="console" data-event="submit" data-success="alert,trigger,reset" data-success-alert="Updated task successfully" data-success-triggers="task.update,modal-close" data-error="alert" data-error-alert="Failed to update task">
+                            <form data-service="projects.updateTask" data-scope="console" data-event="submit" data-success="alert,trigger,reset" data-success-alert="Updated task successfully" data-success-triggers="task.update,modal-close" data-error="alert" data-error-alert="Failed to update task">
 
                                 <input type="hidden" name="projectId" data-ls-bind="{{console-project.$uid}}">
                                 <input type="hidden" name="taskId" data-ls-bind="{{task.$uid}}">
@@ -168,7 +168,7 @@ use Utopia\Locale\Locale;
                                 </div>
                             </form>
 
-                            <form class="margin-top" data-service="projects.tasks.delete" data-scope="console" data-event="submit" data-confirm="Are you sure you want to delete this task?" data-success="alert,trigger" data-success-alert="Deleted task successfully" data-success-triggers="task.delete,modal.close" data-error="alert" data-error-alert="Failed to delete task">
+                            <form class="margin-top" data-service="projects.deleteTask" data-scope="console" data-event="submit" data-confirm="Are you sure you want to delete this task?" data-success="alert,trigger" data-success-alert="Deleted task successfully" data-success-triggers="task.delete,modal.close" data-error="alert" data-error-alert="Failed to delete task">
 
                                 <input type="hidden" name="projectId" data-ls-bind="{{console-project.$uid}}">
                                 <input type="hidden" name="taskId" data-ls-bind="{{task.$uid}}">
@@ -188,7 +188,7 @@ use Utopia\Locale\Locale;
 
             <h1>Add Task</h1>
 
-            <form data-service="projects.tasks.create" data-scope="console" data-event="submit" data-success="alert,trigger,reset" data-success-alert="Created task successfully" data-success-triggers="task.new,modal-close" data-error="alert" data-error-alert="Failed to create task">
+            <form data-service="projects.createTask" data-scope="console" data-event="submit" data-success="alert,trigger,reset" data-success-alert="Created task successfully" data-success-triggers="task.new,modal-close" data-error="alert" data-error-alert="Failed to create task">
 
                 <input type="hidden" name="projectId" data-ls-bind="{{console-project.$uid}}">
 
diff --git a/app/views/console/users/index.phtml b/app/views/console/users/index.phtml
index 4f542d65e6..5d8103c86f 100644
--- a/app/views/console/users/index.phtml
+++ b/app/views/console/users/index.phtml
@@ -23,7 +23,7 @@ $providers = $this->getParam('providers', []);
 
                                 <h1>Create User</h1>
 
-                                <form data-service="users.create" data-event="submit" data-success="alert,trigger,reset" data-success-alert="Created user successfully" data-success-triggers="filter-users-changed,user.new,modal-close" data-error="alert" data-error-alert="Failed to create user">
+                                <form data-service="users.createUser" data-event="submit" data-success="alert,trigger,reset" data-success-alert="Created user successfully" data-success-triggers="filter-users-changed,user.new,modal-close" data-error="alert" data-error-alert="Failed to create user">
 
                                     <label for="user-name">Name</label>
                                     <input type="text" class="full-width" id="user-name" name="name" required autocomplete="off" />
@@ -51,7 +51,7 @@ $providers = $this->getParam('providers', []);
                     </div>
                 </div>
 
-                <div data-service="users.list" data-event="load" data-param-search="" data-param-limit="25" data-param-offset="0" data-scope="sdk" data-name="project-users">
+                <div data-service="users.listUsers" data-event="load" data-param-search="" data-param-limit="25" data-param-offset="0" data-scope="sdk" data-name="project-users">
 
                     <div data-ls-if="0 == {{project-users.sum}}" class="box margin-bottom">
                         <h3 class="margin-bottom">No Users Found</h3>
@@ -234,8 +234,8 @@ $providers = $this->getParam('providers', []);
 
                                 <h1><?php echo ucfirst($provider); ?> OAuth Settings</h1>
 
-                                <form data-service="projects.updateOauth" data-scope="console" data-event="submit" data-param-project-id="{{router.params.project}}" data-success="alert,trigger" data-success-alert="Updated project OAuth settings successfully" data-success-triggers="project.reload,modal-close" data-error="alert" data-error-alert="Failed to update project OAuth settings">
-                                    <input name="provider" id="provider" type="hidden" autocomplete="off" value="<?php echo $provider; ?>">
+                                <form data-service="projects.updateProjectOAuth" data-scope="console" data-event="submit" data-param-project-id="{{router.params.project}}" data-success="alert,trigger" data-success-alert="Updated project OAuth settings successfully" data-success-triggers="project.reload,modal-close" data-error="alert" data-error-alert="Failed to update project OAuth settings">
+                                    <input name="provider" id="provider<?php echo ucfirst($provider); ?>" type="hidden" autocomplete="off" value="<?php echo $provider; ?>">
 
                                     <label for="oauth<?php echo ucfirst($provider); ?>Appid">App ID</label>
                                     <input name="appId" id="oauth<?php echo ucfirst($provider); ?>Appid" type="text" autocomplete="off" data-ls-bind="{{console-project.usersOauth<?php echo ucfirst($provider); ?>Appid}}">
diff --git a/app/views/console/users/view.phtml b/app/views/console/users/view.phtml
index 91d470dc0f..69064330fa 100644
--- a/app/views/console/users/view.phtml
+++ b/app/views/console/users/view.phtml
@@ -1,16 +1,9 @@
 <?php
+
 use Utopia\Locale\Locale;
 
 ?>
-<div data-service="users.get"
-     data-name="user"
-     data-event="load"
-     data-param-user-id="{{router.params.id}}"
-     data-success="render,trigger"
-     data-error="render"
-     data-success-rerender="user.update"
-     data-error-rerender=""
-     data-success-triggers="user.load">
+<div data-service="users.getUser" data-name="user" data-event="load" data-param-user-id="{{router.params.id}}" data-success="render,trigger" data-error="render" data-success-rerender="user.update" data-error-rerender="" data-success-triggers="user.load">
 
     <div class="cover">
         <h1 class="zone xl margin-bottom-large">
@@ -51,34 +44,25 @@ use Utopia\Locale\Locale;
 
                         <h3 class="margin-bottom">Preferences</h3>
 
-                        <div class="box margin-bottom"
-                             data-service="users.getPrefs"
-                             data-name="user-prefs"
-                             data-event="load"
-                             data-param-user-id="{{router.params.id}}"
-                             data-success="render,trigger"
-                             data-error="render"
-                             data-success-rerender=""
-                             data-error-rerender=""
-                             data-success-triggers="user-prefs.load">
+                        <div class="box margin-bottom" data-service="users.getUserPrefs" data-name="user-prefs" data-event="load" data-param-user-id="{{router.params.id}}" data-success="render,trigger" data-error="render" data-success-rerender="" data-error-rerender="" data-success-triggers="user-prefs.load">
 
                             <div data-ls-if="'{{user-prefs}}' && '{}' !== '{{user-prefs}}'" style="display: none;">
                                 <table class="vertical">
                                     <thead>
-                                    <tr>
-                                        <th>Key</th>
-                                        <th>Value</th>
-                                    </tr>
+                                        <tr>
+                                            <th>Key</th>
+                                            <th>Value</th>
+                                        </tr>
                                     </thead>
                                     <tbody data-ls-loop="user-prefs" data-ls-as="pref">
-                                    <tr>
-                                        <td data-title="Key: ">
-                                            <span data-ls-bind="{{$index}}"></span>
-                                        </td>
-                                        <td data-title="Value: ">
-                                            <span data-ls-bind="{{pref}}"></span>
-                                        </td>
-                                    </tr>
+                                        <tr>
+                                            <td data-title="Key: ">
+                                                <span data-ls-bind="{{$index}}"></span>
+                                            </td>
+                                            <td data-title="Value: ">
+                                                <span data-ls-bind="{{pref}}"></span>
+                                            </td>
+                                        </tr>
                                     </tbody>
                                 </table>
                             </div>
@@ -95,29 +79,13 @@ use Utopia\Locale\Locale;
                         </div>
 
                         <div data-ls-if="{{user.status}} !== <?php echo \Auth\Auth::USER_STATUS_BLOCKED; ?>" style="display: none">
-                            <form name="users.updateStatus" class="margin-bottom"
-                                  data-service="users.updateStatus"
-                                  data-event="submit"
-                                  data-param-user-id="{{router.params.id}}"
-                                  data-success="alert,trigger"
-                                  data-success-alert="Blocked User Successfully"
-                                  data-success-triggers="user.update"
-                                  data-error="alert"
-                                  data-error-alert="Failed to Block User">
+                            <form name="users.updateStatus" class="margin-bottom" data-service="users.updateUserStatus" data-event="submit" data-param-user-id="{{router.params.id}}" data-success="alert,trigger" data-success-alert="Blocked User Successfully" data-success-triggers="user.update" data-error="alert" data-error-alert="Failed to Block User">
                                 <button name="status" type="submit" class="danger fill" value="<?php echo \Auth\Auth::USER_STATUS_BLOCKED; ?>">Block Account</button>
                             </form>
                         </div>
 
                         <div data-ls-if="{{user.status}} === <?php echo \Auth\Auth::USER_STATUS_BLOCKED; ?>" style="display: none">
-                            <form name="users.updateStatus" class="margin-bottom"
-                                  data-service="users.updateStatus"
-                                  data-event="submit"
-                                  data-param-user-id="{{router.params.id}}"
-                                  data-success="alert,trigger"
-                                  data-success-alert="Blocked Activated Successfully"
-                                  data-success-triggers="user.update"
-                                  data-error="alert"
-                                  data-error-alert="Failed to Activate User">
+                            <form name="users.updateStatus" class="margin-bottom" data-service="users.updateUserStatus" data-event="submit" data-param-user-id="{{router.params.id}}" data-success="alert,trigger" data-success-alert="Blocked Activated Successfully" data-success-triggers="user.update" data-error="alert" data-error-alert="Failed to Activate User">
 
                                 <button name="status" type="submit" class="fill" value="<?php echo \Auth\Auth::USER_STATUS_ACTIVATED; ?>">Activate Account</button>
                             </form>
@@ -128,13 +96,7 @@ use Utopia\Locale\Locale;
             <li data-state="/console/users/view/devices?id={{router.params.id}}&project={{router.params.project}}">
                 <h2>Devices</h2>
 
-                <div data-service="users.getSessions"
-                     data-name="sessions"
-                     data-param-user-id="{{router.params.id}}"
-                     data-event="load"
-                     data-success="render"
-                     data-error="render"
-                     data-success-rerender="user.update">
+                <div data-service="users.getUserSessions" data-name="sessions" data-param-user-id="{{router.params.id}}" data-event="load" data-success="render" data-error="render" data-success-rerender="user.update">
 
                     <div data-ls-if="{{sessions.length}} === 0" style="display: none" class="margin-top-xl margin-bottom-xl">
                         No sessions available
@@ -144,14 +106,7 @@ use Utopia\Locale\Locale;
                         <div class="box margin-bottom">
                             <ul data-ls-loop="sessions" data-ls-as="session" class="list">
                                 <li class="clear">
-                                    <form class="pull-end"
-                                          data-service="users.deleteSession"
-                                          data-event="submit"
-                                          data-loading="Loading..."
-                                          data-success="trigger"
-                                          data-success-triggers="user.update"
-                                          data-error="alert"
-                                          data-error-alert="Failed to logout session">
+                                    <form class="pull-end" data-service="users.deleteUsersSession" data-event="submit" data-loading="Loading..." data-success="trigger" data-success-triggers="user.update" data-error="alert" data-error-alert="Failed to logout session">
                                         <input type="hidden" name="userId" data-ls-bind="{{router.params.id}}">
                                         <input type="hidden" name="sessionId" data-ls-bind="{{session.id}}">
                                         <button class="danger">Logout</button>
@@ -169,14 +124,7 @@ use Utopia\Locale\Locale;
                             </ul>
                         </div>
 
-                        <form class="inline margin-bottom-large"
-                              data-service="users.deleteSessions"
-                              data-param-user-id="{{router.params.id}}"
-                              data-event="submit"
-                              data-success="trigger"
-                              data-success-triggers="user.update"
-                              data-error="alert"
-                              data-error-alert="Failed to logout all sessions">
+                        <form class="inline margin-bottom-large" data-service="users.deleteUsersSessions" data-param-user-id="{{router.params.id}}" data-event="submit" data-success="trigger" data-success-triggers="user.update" data-error="alert" data-error-alert="Failed to logout all sessions">
                             <button class="danger">Logout from all devices</button>
                         </form>
                     </div>
@@ -186,13 +134,7 @@ use Utopia\Locale\Locale;
             <li data-state="/console/users/view/audit?id={{router.params.id}}&project={{router.params.project}}">
                 <h2>Audit Log</h2>
 
-                <div data-service="users.getLogs"
-                     data-name="logs"
-                     data-param-user-id="{{router.params.id}}"
-                     data-event="load"
-                     data-success="render"
-                     data-success-rerender="logs.load"
-                     data-error="">
+                <div data-service="users.getUserLogs" data-name="logs" data-param-user-id="{{router.params.id}}" data-event="load" data-success="render" data-success-rerender="logs.load" data-error="">
 
                     <div data-ls-if="{{logs.length}} === 0" style="display: none" class="margin-top-xl margin-bottom-xl">
                         No logs available
@@ -201,28 +143,28 @@ use Utopia\Locale\Locale;
                     <div class="box" data-ls-if="{{logs.length}} !== 0" style="display: none">
                         <table class="vertical small">
                             <thead>
-                            <tr>
-                                <th width="140"><?php echo Locale::getText('console.account.section.security.recent-activity.date'); ?></th>
-                                <th width="175"><?php echo Locale::getText('console.account.section.security.recent-activity.event'); ?></th>
-                                <th><?php echo Locale::getText('console.account.section.security.recent-activity.client'); ?></th>
-                                <th width="90"><?php echo Locale::getText('console.account.section.security.recent-activity.location'); ?></th>
-                                <th width="90"><?php echo Locale::getText('console.account.section.security.recent-activity.ip'); ?></th>
-                            </tr>
+                                <tr>
+                                    <th width="140"><?php echo Locale::getText('console.account.section.security.recent-activity.date'); ?></th>
+                                    <th width="175"><?php echo Locale::getText('console.account.section.security.recent-activity.event'); ?></th>
+                                    <th><?php echo Locale::getText('console.account.section.security.recent-activity.client'); ?></th>
+                                    <th width="90"><?php echo Locale::getText('console.account.section.security.recent-activity.location'); ?></th>
+                                    <th width="90"><?php echo Locale::getText('console.account.section.security.recent-activity.ip'); ?></th>
+                                </tr>
                             </thead>
                             <tbody data-ls-loop="logs" data-ls-as="log">
-                            <tr>
-                                <td data-title="<?php echo $this->escape(Locale::getText('console.account.section.security.recent-activity.date')); ?>: "><span data-ls-bind="{{log.time|date-time}}"></span></td>
-                                <td data-title="<?php echo $this->escape(Locale::getText('console.account.section.security.recent-activity.event')); ?>: "><span data-ls-bind="{{log.event}}"></span></td>
-                                <td data-title="<?php echo $this->escape(Locale::getText('console.account.section.security.recent-activity.client')); ?>: ">
-                                    <img data-ls-attrs="src={{env.API}}/v1/avatars/browsers/{{log.client.short_name|lowercase}}?width=80&height=80,title={{log.client.name}},alt={{log.client.name}}" class="avatar xs inline margin-end-small" />
-                                    <span data-ls-bind="{{log.client.name}} {{log.client.version}} on {{log.model}} {{log.OS.name}} {{log.OS.version}}"></span>
-                                </td>
-                                <td data-title="<?php echo $this->escape(Locale::getText('console.account.section.security.recent-activity.location')); ?>: ">
-                                    <img data-ls-attrs="src={{env.API}}/v1/avatars/flags/{{log.geo.isoCode}}?width=80&height=80" class="avatar xs inline margin-end-small" />
-                                    <span data-ls-bind="{{log.geo.country}}"></span>
-                                </td>
-                                <td data-title="<?php echo $this->escape(Locale::getText('console.account.section.security.recent-activity.ip')); ?>: "><span data-ls-bind="{{log.ip}}"></span></td>
-                            </tr>
+                                <tr>
+                                    <td data-title="<?php echo $this->escape(Locale::getText('console.account.section.security.recent-activity.date')); ?>: "><span data-ls-bind="{{log.time|date-time}}"></span></td>
+                                    <td data-title="<?php echo $this->escape(Locale::getText('console.account.section.security.recent-activity.event')); ?>: "><span data-ls-bind="{{log.event}}"></span></td>
+                                    <td data-title="<?php echo $this->escape(Locale::getText('console.account.section.security.recent-activity.client')); ?>: ">
+                                        <img data-ls-attrs="src={{env.API}}/v1/avatars/browsers/{{log.client.short_name|lowercase}}?width=80&height=80,title={{log.client.name}},alt={{log.client.name}}" class="avatar xs inline margin-end-small" />
+                                        <span data-ls-bind="{{log.client.name}} {{log.client.version}} on {{log.model}} {{log.OS.name}} {{log.OS.version}}"></span>
+                                    </td>
+                                    <td data-title="<?php echo $this->escape(Locale::getText('console.account.section.security.recent-activity.location')); ?>: ">
+                                        <img data-ls-attrs="src={{env.API}}/v1/avatars/flags/{{log.geo.isoCode}}?width=80&height=80" class="avatar xs inline margin-end-small" />
+                                        <span data-ls-bind="{{log.geo.country}}"></span>
+                                    </td>
+                                    <td data-title="<?php echo $this->escape(Locale::getText('console.account.section.security.recent-activity.ip')); ?>: "><span data-ls-bind="{{log.ip}}"></span></td>
+                                </tr>
                             </tbody>
                         </table>
                     </div>
diff --git a/app/views/console/webhooks/index.phtml b/app/views/console/webhooks/index.phtml
index c732b5ebd5..3793e3cdae 100644
--- a/app/views/console/webhooks/index.phtml
+++ b/app/views/console/webhooks/index.phtml
@@ -22,7 +22,7 @@ $events = [
     </h1>
 </div>
 
-<div class="zone xl" data-service="projects.webhooks.list" data-scope="console" data-event="load" data-name="console-webhooks" data-param-project-id="{{router.params.project}}" data-success="render,trigger" data-success-rerender="webhook.new,webhook.update,webhook.delete" data-success-triggers="project.load" data-error="render" data-error-rerender="">
+<div class="zone xl" data-service="projects.listWebhooks" data-scope="console" data-event="load" data-name="console-webhooks" data-param-project-id="{{router.params.project}}" data-success="render,trigger" data-success-rerender="webhook.new,webhook.update,webhook.delete" data-success-triggers="project.load" data-error="render" data-error-rerender="">
 
     <div data-ls-if="0 == {{console-webhooks.length}} || undefined == {{console-webhooks.length}}" class="box margin-top margin-bottom" style="display: none;">
         <h3 class="margin-bottom-small">No Webhooks Found</h3>
@@ -97,7 +97,7 @@ $events = [
                     </form>
                 </div>
 
-                <form class="pull-end margin-end" data-service="projects.webhooks.delete" data-scope="console" data-event="submit" data-confirm="Are you sure you want to delete this webhook?" data-success="alert,trigger" data-success-alert="Deleted webhook successfully" data-success-triggers="webhook.delete" data-error="alert" data-error-alert="Failed to delete webhook">
+                <form class="pull-end margin-end" data-service="projects.deleteWebhook" data-scope="console" data-event="submit" data-confirm="Are you sure you want to delete this webhook?" data-success="alert,trigger" data-success-alert="Deleted webhook successfully" data-success-triggers="webhook.delete" data-error="alert" data-error-alert="Failed to delete webhook">
 
                     <input type="hidden" name="projectId" data-ls-bind="{{console-project.$uid}}">
                     <input type="hidden" name="webhookId" data-ls-bind="{{webhook.$uid}}">
@@ -120,7 +120,7 @@ $events = [
 
             <h1>Add Webhook</h1>
 
-            <form data-service="projects.webhooks.create" data-scope="console" data-event="submit" data-success="alert,trigger,reset" data-success-alert="Created webhook successfully" data-success-triggers="webhook.new,modal-close" data-error="alert" data-error-alert="Failed to create webhook">
+            <form data-service="projects.createWebhook" data-scope="console" data-event="submit" data-success="alert,trigger,reset" data-success-alert="Created webhook successfully" data-success-triggers="webhook.new,modal-close" data-error="alert" data-error-alert="Failed to create webhook">
 
                 <input type="hidden" name="projectId" data-ls-bind="{{console-project.$uid}}">
 
diff --git a/public/styles/comps/tabs.less b/public/styles/comps/tabs.less
index fb53cc3087..849c43bd6b 100644
--- a/public/styles/comps/tabs.less
+++ b/public/styles/comps/tabs.less
@@ -31,13 +31,13 @@
   position: relative;
 
   .tabs {
-    height: 60px;
-    line-height: 60px;
+    height: 55px;
+    line-height: 55px;
     list-style: none;
     padding: 0;
     .clear;
     .margin-bottom-large;
-    margin-top: -60px;
+    margin-top: -55px;
     -webkit-touch-callout: none;
     -webkit-user-select: none;
     -khtml-user-select: none;