diff --git a/app/controllers/admin/admin_panel_controller.rb b/app/controllers/admin/admin_panel_controller.rb
index e86ed9b..4d8814d 100644
--- a/app/controllers/admin/admin_panel_controller.rb
+++ b/app/controllers/admin/admin_panel_controller.rb
@@ -1,4 +1,4 @@
-class AdminPanelController < EnvironmentAdminController
+class AdminPanelController < AdminController
 
   before_filter :login_required
   
diff --git a/app/controllers/admin/categories_controller.rb b/app/controllers/admin/categories_controller.rb
index 544acaa..304145e 100644
--- a/app/controllers/admin/categories_controller.rb
+++ b/app/controllers/admin/categories_controller.rb
@@ -1,4 +1,4 @@
-class CategoriesController < EnvironmentAdminController
+class CategoriesController < AdminController
 
   protect 'manage_environment_categories', :environment
   
diff --git a/app/controllers/admin/edit_template_controller.rb b/app/controllers/admin/edit_template_controller.rb
index 88e4611..8f21b21 100644
--- a/app/controllers/admin/edit_template_controller.rb
+++ b/app/controllers/admin/edit_template_controller.rb
@@ -1,4 +1,4 @@
-class EditTemplateController < EnvironmentAdminController
+class EditTemplateController < AdminController
   
   design_editor :holder => 'environment', :autosave => true, :block_types => :block_types
 
diff --git a/app/controllers/admin/features_controller.rb b/app/controllers/admin/features_controller.rb
index 174a916..2756707 100644
--- a/app/controllers/admin/features_controller.rb
+++ b/app/controllers/admin/features_controller.rb
@@ -1,4 +1,4 @@
-class FeaturesController < EnvironmentAdminController
+class FeaturesController < AdminController
   protect 'edit_environment_features', :environment
   
   acts_as_environment_admin_controller
diff --git a/app/controllers/admin/manage_tags_controller.rb b/app/controllers/admin/manage_tags_controller.rb
index 89a9cbd..2fe0617 100644
--- a/app/controllers/admin/manage_tags_controller.rb
+++ b/app/controllers/admin/manage_tags_controller.rb
@@ -1,5 +1,5 @@
 # Manage tags stored by the acts-as_taggable_on_steroids plugin by providing an interface to create, destroy, update and list them
-class ManageTagsController < EnvironmentAdminController
+class ManageTagsController < AdminController
 
   # Index redirects to list action without modifing the url
   def index
diff --git a/app/controllers/admin/role_controller.rb b/app/controllers/admin/role_controller.rb
index 277e638..2b2e861 100644
--- a/app/controllers/admin/role_controller.rb
+++ b/app/controllers/admin/role_controller.rb
@@ -1,4 +1,4 @@
-class RoleController < EnvironmentAdminController
+class RoleController < AdminController
   protect 'manage_environment_roles', :environment
 
   def index
--
libgit2 0.21.2