diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98e8d8da9..6e6b96ad3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
     * Add 2 new language values for French [#1174](https://github.com/getgrav/grav/issues/1174)
 1. [](#bugfix)
     * Fixed issue when we have a meta file without corresponding media [#1179](https://github.com/getgrav/grav/issues/1179)
+    * Update class namespace for Admin class [#874](https://github.com/getgrav/grav-plugin-admin/issues/874)
 
 # v1.1.9-rc.1
 ## 11/09/2016
diff --git a/system/blueprints/pages/default.yaml b/system/blueprints/pages/default.yaml
index 14116aab0..f54468082 100644
--- a/system/blueprints/pages/default.yaml
+++ b/system/blueprints/pages/default.yaml
@@ -139,7 +139,7 @@ form:
                       label: PLUGIN_ADMIN.PARENT
                       classes: fancy
                       data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
-                      data-default@: '\Grav\Plugin\admin::rawRoute'
+                      data-default@: '\Grav\Plugin\Admin\Admin::rawRoute'
                       options:
                         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
 
diff --git a/system/blueprints/pages/modular_new.yaml b/system/blueprints/pages/modular_new.yaml
index 57ede83e8..8c19d8960 100644
--- a/system/blueprints/pages/modular_new.yaml
+++ b/system/blueprints/pages/modular_new.yaml
@@ -30,7 +30,7 @@ form:
       label: PLUGIN_ADMIN.PAGE
       classes: fancy
       data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
-      data-default@: '\Grav\Plugin\admin::rawRoute'
+      data-default@: '\Grav\Plugin\Admin\Admin::rawRoute'
       validate:
         required: true
 
diff --git a/system/blueprints/pages/modular_raw.yaml b/system/blueprints/pages/modular_raw.yaml
index 6e71eaa13..8e4647989 100644
--- a/system/blueprints/pages/modular_raw.yaml
+++ b/system/blueprints/pages/modular_raw.yaml
@@ -79,7 +79,7 @@ form:
                       label: PLUGIN_ADMIN.PARENT
                       classes: fancy
                       data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
-                      data-default@: '\Grav\Plugin\admin::rawRoute'
+                      data-default@: '\Grav\Plugin\Admin\Admin::rawRoute'
                       options:
                         '': PLUGIN_ADMIN.DEFAULT_OPTION_SELECT
                       validate:
diff --git a/system/blueprints/pages/move.yaml b/system/blueprints/pages/move.yaml
index 5fda52fd2..518f21828 100644
--- a/system/blueprints/pages/move.yaml
+++ b/system/blueprints/pages/move.yaml
@@ -12,6 +12,6 @@ form:
       label: PLUGIN_ADMIN.PARENT
       classes: fancy
       data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
-      data-default@: '\Grav\Plugin\admin::rawRoute'
+      data-default@: '\Grav\Plugin\Admin\Admin::rawRoute'
       options:
         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
diff --git a/system/blueprints/pages/new.yaml b/system/blueprints/pages/new.yaml
index 0b2fe75fc..71ca78a81 100644
--- a/system/blueprints/pages/new.yaml
+++ b/system/blueprints/pages/new.yaml
@@ -32,7 +32,7 @@ form:
       label: PLUGIN_ADMIN.PARENT_PAGE
       classes: fancy
       data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
-      data-default@: '\Grav\Plugin\admin::getLastPageRoute'
+      data-default@: '\Grav\Plugin\Admin\Admin::getLastPageRoute'
       options:
         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
       validate:
@@ -44,7 +44,7 @@ form:
       label: PLUGIN_ADMIN.PAGE_FILE
       help: PLUGIN_ADMIN.PAGE_FILE_HELP
       data-options@: '\Grav\Common\Page\Pages::types'
-      data-default@: '\Grav\Plugin\admin::getLastPageName'
+      data-default@: '\Grav\Plugin\Admin\Admin::getLastPageName'
       validate:
         required: true
 
diff --git a/system/blueprints/pages/new_folder.yaml b/system/blueprints/pages/new_folder.yaml
index c4fe96165..ddf47a97d 100644
--- a/system/blueprints/pages/new_folder.yaml
+++ b/system/blueprints/pages/new_folder.yaml
@@ -25,7 +25,7 @@ form:
       label: PLUGIN_ADMIN.PARENT_PAGE
       classes: fancy
       data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
-      data-default@: '\Grav\Plugin\admin::getLastPageRoute'
+      data-default@: '\Grav\Plugin\Admin\Admin::getLastPageRoute'
       options:
         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
       validate:
diff --git a/system/blueprints/pages/raw.yaml b/system/blueprints/pages/raw.yaml
index fe5dba2fe..3b582eb14 100644
--- a/system/blueprints/pages/raw.yaml
+++ b/system/blueprints/pages/raw.yaml
@@ -79,7 +79,7 @@ form:
                       label: PLUGIN_ADMIN.PARENT
                       classes: fancy
                       data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
-                      data-default@: '\Grav\Plugin\admin::rawRoute'
+                      data-default@: '\Grav\Plugin\Admin\Admin::rawRoute'
                       options:
                         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
 
diff --git a/system/blueprints/user/account.yaml b/system/blueprints/user/account.yaml
index bd1caa85f..e53544744 100644
--- a/system/blueprints/user/account.yaml
+++ b/system/blueprints/user/account.yaml
@@ -1,4 +1,4 @@
-title: Site
+title: Account
 form:
     validation: loose
 
@@ -56,7 +56,7 @@ form:
                 label: PLUGIN_ADMIN.LANGUAGE
                 size: medium
                 classes: fancy
-                data-options@: '\Grav\Plugin\admin::adminLanguages'
+                data-options@: '\Grav\Plugin\Admin\Admin::adminLanguages'
                 default: 'en'
                 help: PLUGIN_ADMIN.LANGUAGE_HELP