diff --git a/admins/pageflow/accounts.rb b/admins/pageflow/accounts.rb
index 50c0ea4d6..40bfa3322 100644
--- a/admins/pageflow/accounts.rb
+++ b/admins/pageflow/accounts.rb
@@ -67,11 +67,11 @@ module Pageflow
     end
 
     controller do
-      helper Pageflow::Admin::CutoffModesHelper
-      helper Pageflow::Admin::FeaturesHelper
-      helper Pageflow::Admin::FormHelper
-      helper Pageflow::Admin::LocalesHelper
-      helper Pageflow::Admin::MembershipsHelper
+      helper Admin::CutoffModesHelper
+      helper Admin::FeaturesHelper
+      helper Admin::FormHelper
+      helper Admin::LocalesHelper
+      helper Admin::MembershipsHelper
       helper ThemesHelper
 
       def new
diff --git a/admins/pageflow/entry_templates.rb b/admins/pageflow/entry_templates.rb
index 7f034268f..0b71ec354 100644
--- a/admins/pageflow/entry_templates.rb
+++ b/admins/pageflow/entry_templates.rb
@@ -12,9 +12,9 @@ module Pageflow
     end
 
     controller do
-      helper Pageflow::Admin::FormHelper
-      helper Pageflow::Admin::WidgetsHelper
-      helper Pageflow::Admin::LocalesHelper
+      helper Admin::FormHelper
+      helper Admin::WidgetsHelper
+      helper Admin::LocalesHelper
 
       def index
         redirect_to redirect_path
diff --git a/admins/pageflow/membership.rb b/admins/pageflow/membership.rb
index 7bebcad2d..cbfd67da4 100644
--- a/admins/pageflow/membership.rb
+++ b/admins/pageflow/membership.rb
@@ -80,8 +80,8 @@ module Pageflow
       belongs_to :account, parent_class: Pageflow::Account, polymorphic: true
       belongs_to :user, parent_class: User, polymorphic: true
 
-      helper Pageflow::Admin::MembershipsHelper
-      helper Pageflow::Admin::FormHelper
+      helper Admin::MembershipsHelper
+      helper Admin::FormHelper
 
       def index
         if params[:user_id].present?
diff --git a/admins/pageflow/revisions.rb b/admins/pageflow/revisions.rb
index 3dcf19d9f..835ce1d4e 100644
--- a/admins/pageflow/revisions.rb
+++ b/admins/pageflow/revisions.rb
@@ -20,7 +20,7 @@ module Pageflow
     controller do
       include EditLocking
 
-      helper Pageflow::Admin::FormHelper
+      helper Admin::FormHelper
 
       def permitted_params
         params.permit(revision: [:published_until])
diff --git a/admins/pageflow/sites.rb b/admins/pageflow/sites.rb
index 6589974b9..cd04f2cdc 100644
--- a/admins/pageflow/sites.rb
+++ b/admins/pageflow/sites.rb
@@ -35,8 +35,8 @@ module Pageflow
     end
 
     controller do
-      helper Pageflow::Admin::CutoffModesHelper
-      helper Pageflow::Admin::FormHelper
+      helper Admin::CutoffModesHelper
+      helper Admin::FormHelper
 
       before_create do |site|
         site.build_default_permalink_directory
diff --git a/admins/pageflow/translations.rb b/admins/pageflow/translations.rb
index 0106411d6..01bb6fe1d 100644
--- a/admins/pageflow/translations.rb
+++ b/admins/pageflow/translations.rb
@@ -36,7 +36,7 @@ module Pageflow
     end
 
     controller do
-      helper Pageflow::Admin::FormHelper
+      helper Admin::FormHelper
 
       def index
         redirect_to admin_entry_path(parent, tab: 'translations')
diff --git a/admins/pageflow/user.rb b/admins/pageflow/user.rb
index 9d155588e..6ebb454ea 100644
--- a/admins/pageflow/user.rb
+++ b/admins/pageflow/user.rb
@@ -161,12 +161,12 @@ module Pageflow
     end
 
     controller do
-      include Pageflow::QuotaVerification
-      helper Pageflow::Admin::FormHelper
-      helper Pageflow::Admin::LocalesHelper
-      helper Pageflow::Admin::MembershipsHelper
-      helper Pageflow::Admin::UsersHelper
-      helper Pageflow::QuotaHelper
+      include QuotaVerification
+      helper Admin::FormHelper
+      helper Admin::LocalesHelper
+      helper Admin::MembershipsHelper
+      helper Admin::UsersHelper
+      helper QuotaHelper
 
       def scoped_collection
         super.includes(account_memberships: :entity)