Moved the MVC to extend the CMS MVC via namespace.

admin/controllers/admin_custom_tabs.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Admin_custom_tabs Controller
+ * Admin_custom_tabs Form Controller
  */
-class ComponentbuilderControllerAdmin_custom_tabs extends JControllerForm
+class ComponentbuilderControllerAdmin_custom_tabs extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/admin_fields.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Admin_fields Controller
+ * Admin_fields Form Controller
  */
-class ComponentbuilderControllerAdmin_fields extends JControllerForm
+class ComponentbuilderControllerAdmin_fields extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/admin_fields_conditions.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Admin_fields_conditions Controller
+ * Admin_fields_conditions Form Controller
  */
-class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm
+class ComponentbuilderControllerAdmin_fields_conditions extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/admin_fields_relations.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Admin_fields_relations Controller
+ * Admin_fields_relations Form Controller
  */
-class ComponentbuilderControllerAdmin_fields_relations extends JControllerForm
+class ComponentbuilderControllerAdmin_fields_relations extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/admin_view.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Admin_view Controller
+ * Admin_view Form Controller
  */
-class ComponentbuilderControllerAdmin_view extends JControllerForm
+class ComponentbuilderControllerAdmin_view extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/admin_views.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Admin_views Controller
+ * Admin_views Admin Controller
  */
-class ComponentbuilderControllerAdmin_views extends JControllerAdmin
+class ComponentbuilderControllerAdmin_views extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/admins_custom_tabs.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Admins_custom_tabs Controller
+ * Admins_custom_tabs Admin Controller
  */
-class ComponentbuilderControllerAdmins_custom_tabs extends JControllerAdmin
+class ComponentbuilderControllerAdmins_custom_tabs extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/admins_fields.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Admins_fields Controller
+ * Admins_fields Admin Controller
  */
-class ComponentbuilderControllerAdmins_fields extends JControllerAdmin
+class ComponentbuilderControllerAdmins_fields extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/admins_fields_conditions.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Admins_fields_conditions Controller
+ * Admins_fields_conditions Admin Controller
  */
-class ComponentbuilderControllerAdmins_fields_conditions extends JControllerAdmin
+class ComponentbuilderControllerAdmins_fields_conditions extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/admins_fields_relations.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Admins_fields_relations Controller
+ * Admins_fields_relations Admin Controller
  */
-class ComponentbuilderControllerAdmins_fields_relations extends JControllerAdmin
+class ComponentbuilderControllerAdmins_fields_relations extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/ajax.json.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Componentbuilder Ajax Controller
+ * Componentbuilder Ajax Base Controller
  */
-class ComponentbuilderControllerAjax extends JControllerLegacy
+class ComponentbuilderControllerAjax extends BaseController
 {
 	public function __construct($config)
 	{

admin/controllers/class_extendings.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Class_extendings Controller
+ * Class_extendings Admin Controller
  */
-class ComponentbuilderControllerClass_extendings extends JControllerAdmin
+class ComponentbuilderControllerClass_extendings extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/class_extends.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Class_extends Controller
+ * Class_extends Form Controller
  */
-class ComponentbuilderControllerClass_extends extends JControllerForm
+class ComponentbuilderControllerClass_extends extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/class_method.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Class_method Controller
+ * Class_method Form Controller
  */
-class ComponentbuilderControllerClass_method extends JControllerForm
+class ComponentbuilderControllerClass_method extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/class_methods.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Class_methods Controller
+ * Class_methods Admin Controller
  */
-class ComponentbuilderControllerClass_methods extends JControllerAdmin
+class ComponentbuilderControllerClass_methods extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/class_properties.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Class_properties Controller
+ * Class_properties Admin Controller
  */
-class ComponentbuilderControllerClass_properties extends JControllerAdmin
+class ComponentbuilderControllerClass_properties extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/class_property.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Class_property Controller
+ * Class_property Form Controller
  */
-class ComponentbuilderControllerClass_property extends JControllerForm
+class ComponentbuilderControllerClass_property extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/compiler.php

@@ -13,14 +13,22 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Compiler Controller
+ * Compiler Admin Controller
  */
-class ComponentbuilderControllerCompiler extends JControllerAdmin
+class ComponentbuilderControllerCompiler extends AdminController
 {
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPILER';
+
 	/**
 	 * Proxy for getModel.
 	 * @since	2.5
@@ -32,7 +40,7 @@ class ComponentbuilderControllerCompiler extends JControllerAdmin
 		return $model;
 	}
 
-        public function dashboard()
+	public function dashboard()
 	{
 		$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder', false));
 		return;

admin/controllers/component_admin_views.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Component_admin_views Controller
+ * Component_admin_views Form Controller
  */
-class ComponentbuilderControllerComponent_admin_views extends JControllerForm
+class ComponentbuilderControllerComponent_admin_views extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/component_config.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Component_config Controller
+ * Component_config Form Controller
  */
-class ComponentbuilderControllerComponent_config extends JControllerForm
+class ComponentbuilderControllerComponent_config extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/component_custom_admin_menus.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Component_custom_admin_menus Controller
+ * Component_custom_admin_menus Form Controller
  */
-class ComponentbuilderControllerComponent_custom_admin_menus extends JControllerForm
+class ComponentbuilderControllerComponent_custom_admin_menus extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/component_custom_admin_views.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Component_custom_admin_views Controller
+ * Component_custom_admin_views Form Controller
  */
-class ComponentbuilderControllerComponent_custom_admin_views extends JControllerForm
+class ComponentbuilderControllerComponent_custom_admin_views extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/component_dashboard.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Component_dashboard Controller
+ * Component_dashboard Form Controller
  */
-class ComponentbuilderControllerComponent_dashboard extends JControllerForm
+class ComponentbuilderControllerComponent_dashboard extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/component_files_folders.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Component_files_folders Controller
+ * Component_files_folders Form Controller
  */
-class ComponentbuilderControllerComponent_files_folders extends JControllerForm
+class ComponentbuilderControllerComponent_files_folders extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/component_modules.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Component_modules Controller
+ * Component_modules Form Controller
  */
-class ComponentbuilderControllerComponent_modules extends JControllerForm
+class ComponentbuilderControllerComponent_modules extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/component_mysql_tweaks.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Component_mysql_tweaks Controller
+ * Component_mysql_tweaks Form Controller
  */
-class ComponentbuilderControllerComponent_mysql_tweaks extends JControllerForm
+class ComponentbuilderControllerComponent_mysql_tweaks extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/component_placeholders.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Component_placeholders Controller
+ * Component_placeholders Form Controller
  */
-class ComponentbuilderControllerComponent_placeholders extends JControllerForm
+class ComponentbuilderControllerComponent_placeholders extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/component_plugins.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Component_plugins Controller
+ * Component_plugins Form Controller
  */
-class ComponentbuilderControllerComponent_plugins extends JControllerForm
+class ComponentbuilderControllerComponent_plugins extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/component_site_views.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Component_site_views Controller
+ * Component_site_views Form Controller
  */
-class ComponentbuilderControllerComponent_site_views extends JControllerForm
+class ComponentbuilderControllerComponent_site_views extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/component_updates.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Component_updates Controller
+ * Component_updates Form Controller
  */
-class ComponentbuilderControllerComponent_updates extends JControllerForm
+class ComponentbuilderControllerComponent_updates extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/componentbuilder.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-
+use Joomla\CMS\MVC\Controller\AdminController;
+use Joomla\Utilities\ArrayHelper;
 
 /**
- * Componentbuilder Controller
+ * Componentbuilder Admin Controller
  */
-class ComponentbuilderControllerComponentbuilder extends JControllerAdmin
+class ComponentbuilderControllerComponentbuilder extends AdminController
 {
 
 }

admin/controllers/components_admin_views.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Components_admin_views Controller
+ * Components_admin_views Admin Controller
  */
-class ComponentbuilderControllerComponents_admin_views extends JControllerAdmin
+class ComponentbuilderControllerComponents_admin_views extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/components_config.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Components_config Controller
+ * Components_config Admin Controller
  */
-class ComponentbuilderControllerComponents_config extends JControllerAdmin
+class ComponentbuilderControllerComponents_config extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/components_custom_admin_menus.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Components_custom_admin_menus Controller
+ * Components_custom_admin_menus Admin Controller
  */
-class ComponentbuilderControllerComponents_custom_admin_menus extends JControllerAdmin
+class ComponentbuilderControllerComponents_custom_admin_menus extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/components_custom_admin_views.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Components_custom_admin_views Controller
+ * Components_custom_admin_views Admin Controller
  */
-class ComponentbuilderControllerComponents_custom_admin_views extends JControllerAdmin
+class ComponentbuilderControllerComponents_custom_admin_views extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/components_dashboard.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Components_dashboard Controller
+ * Components_dashboard Admin Controller
  */
-class ComponentbuilderControllerComponents_dashboard extends JControllerAdmin
+class ComponentbuilderControllerComponents_dashboard extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/components_files_folders.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Components_files_folders Controller
+ * Components_files_folders Admin Controller
  */
-class ComponentbuilderControllerComponents_files_folders extends JControllerAdmin
+class ComponentbuilderControllerComponents_files_folders extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/components_modules.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Components_modules Controller
+ * Components_modules Admin Controller
  */
-class ComponentbuilderControllerComponents_modules extends JControllerAdmin
+class ComponentbuilderControllerComponents_modules extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/components_mysql_tweaks.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Components_mysql_tweaks Controller
+ * Components_mysql_tweaks Admin Controller
  */
-class ComponentbuilderControllerComponents_mysql_tweaks extends JControllerAdmin
+class ComponentbuilderControllerComponents_mysql_tweaks extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/components_placeholders.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Components_placeholders Controller
+ * Components_placeholders Admin Controller
  */
-class ComponentbuilderControllerComponents_placeholders extends JControllerAdmin
+class ComponentbuilderControllerComponents_placeholders extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/components_plugins.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Components_plugins Controller
+ * Components_plugins Admin Controller
  */
-class ComponentbuilderControllerComponents_plugins extends JControllerAdmin
+class ComponentbuilderControllerComponents_plugins extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/components_site_views.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Components_site_views Controller
+ * Components_site_views Admin Controller
  */
-class ComponentbuilderControllerComponents_site_views extends JControllerAdmin
+class ComponentbuilderControllerComponents_site_views extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/components_updates.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Components_updates Controller
+ * Components_updates Admin Controller
  */
-class ComponentbuilderControllerComponents_updates extends JControllerAdmin
+class ComponentbuilderControllerComponents_updates extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/custom_admin_view.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Custom_admin_view Controller
+ * Custom_admin_view Form Controller
  */
-class ComponentbuilderControllerCustom_admin_view extends JControllerForm
+class ComponentbuilderControllerCustom_admin_view extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/custom_admin_views.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Custom_admin_views Controller
+ * Custom_admin_views Admin Controller
  */
-class ComponentbuilderControllerCustom_admin_views extends JControllerAdmin
+class ComponentbuilderControllerCustom_admin_views extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/custom_code.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Custom_code Controller
+ * Custom_code Form Controller
  */
-class ComponentbuilderControllerCustom_code extends JControllerForm
+class ComponentbuilderControllerCustom_code extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/custom_codes.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Custom_codes Controller
+ * Custom_codes Admin Controller
  */
-class ComponentbuilderControllerCustom_codes extends JControllerAdmin
+class ComponentbuilderControllerCustom_codes extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/dynamic_get.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Dynamic_get Controller
+ * Dynamic_get Form Controller
  */
-class ComponentbuilderControllerDynamic_get extends JControllerForm
+class ComponentbuilderControllerDynamic_get extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/dynamic_gets.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Dynamic_gets Controller
+ * Dynamic_gets Admin Controller
  */
-class ComponentbuilderControllerDynamic_gets extends JControllerAdmin
+class ComponentbuilderControllerDynamic_gets extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/field.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Field Controller
+ * Field Form Controller
  */
-class ComponentbuilderControllerField extends JControllerForm
+class ComponentbuilderControllerField extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/fields.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Fields Controller
+ * Fields Admin Controller
  */
-class ComponentbuilderControllerFields extends JControllerAdmin
+class ComponentbuilderControllerFields extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/fieldtype.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Fieldtype Controller
+ * Fieldtype Form Controller
  */
-class ComponentbuilderControllerFieldtype extends JControllerForm
+class ComponentbuilderControllerFieldtype extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/fieldtypes.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Fieldtypes Controller
+ * Fieldtypes Admin Controller
  */
-class ComponentbuilderControllerFieldtypes extends JControllerAdmin
+class ComponentbuilderControllerFieldtypes extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/get_snippets.php

@@ -13,14 +13,22 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Get_snippets Controller
+ * Get_snippets Admin Controller
  */
-class ComponentbuilderControllerGet_snippets extends JControllerAdmin
+class ComponentbuilderControllerGet_snippets extends AdminController
 {
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER_GET_SNIPPETS';
+
 	/**
 	 * Proxy for getModel.
 	 * @since	2.5
@@ -32,7 +40,7 @@ class ComponentbuilderControllerGet_snippets extends JControllerAdmin
 		return $model;
 	}
 
-        public function dashboard()
+	public function dashboard()
 	{
 		$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder', false));
 		return;

admin/controllers/help.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Componentbuilder Help Controller
+ * Componentbuilder Help Base Controller
  */
-class ComponentbuilderControllerHelp extends JControllerLegacy
+class ComponentbuilderControllerHelp extends BaseController
 {
 	public function __construct($config)
 	{

admin/controllers/help_document.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Help_document Controller
+ * Help_document Form Controller
  */
-class ComponentbuilderControllerHelp_document extends JControllerForm
+class ComponentbuilderControllerHelp_document extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/help_documents.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Help_documents Controller
+ * Help_documents Admin Controller
  */
-class ComponentbuilderControllerHelp_documents extends JControllerAdmin
+class ComponentbuilderControllerHelp_documents extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/import.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Componentbuilder Import Controller
+ * Componentbuilder Import Base Controller
  */
-class ComponentbuilderControllerImport extends JControllerLegacy
+class ComponentbuilderControllerImport extends BaseController
 {
 	/**
 	 * Import an spreadsheet.

admin/controllers/import_joomla_components.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Componentbuilder Import_joomla_components Controller
+ * Componentbuilder Import_joomla_components Base Controller
  */
-class ComponentbuilderControllerImport_joomla_components extends JControllerLegacy
+class ComponentbuilderControllerImport_joomla_components extends BaseController
 {
 	/**
 	 * Import an spreadsheet.

admin/controllers/import_language_translations.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Componentbuilder Import_language_translations Controller
+ * Componentbuilder Import_language_translations Base Controller
  */
-class ComponentbuilderControllerImport_language_translations extends JControllerLegacy
+class ComponentbuilderControllerImport_language_translations extends BaseController
 {
 	/**
 	 * Import an spreadsheet.

admin/controllers/joomla_component.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Joomla_component Controller
+ * Joomla_component Form Controller
  */
-class ComponentbuilderControllerJoomla_component extends JControllerForm
+class ComponentbuilderControllerJoomla_component extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/joomla_components.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Joomla_components Controller
+ * Joomla_components Admin Controller
  */
-class ComponentbuilderControllerJoomla_components extends JControllerAdmin
+class ComponentbuilderControllerJoomla_components extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/joomla_module.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Joomla_module Controller
+ * Joomla_module Form Controller
  */
-class ComponentbuilderControllerJoomla_module extends JControllerForm
+class ComponentbuilderControllerJoomla_module extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/joomla_module_files_folders_urls.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Joomla_module_files_folders_urls Controller
+ * Joomla_module_files_folders_urls Form Controller
  */
-class ComponentbuilderControllerJoomla_module_files_folders_urls extends JControllerForm
+class ComponentbuilderControllerJoomla_module_files_folders_urls extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/joomla_module_updates.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Joomla_module_updates Controller
+ * Joomla_module_updates Form Controller
  */
-class ComponentbuilderControllerJoomla_module_updates extends JControllerForm
+class ComponentbuilderControllerJoomla_module_updates extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/joomla_modules.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Joomla_modules Controller
+ * Joomla_modules Admin Controller
  */
-class ComponentbuilderControllerJoomla_modules extends JControllerAdmin
+class ComponentbuilderControllerJoomla_modules extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/joomla_modules_files_folders_urls.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Joomla_modules_files_folders_urls Controller
+ * Joomla_modules_files_folders_urls Admin Controller
  */
-class ComponentbuilderControllerJoomla_modules_files_folders_urls extends JControllerAdmin
+class ComponentbuilderControllerJoomla_modules_files_folders_urls extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/joomla_modules_updates.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Joomla_modules_updates Controller
+ * Joomla_modules_updates Admin Controller
  */
-class ComponentbuilderControllerJoomla_modules_updates extends JControllerAdmin
+class ComponentbuilderControllerJoomla_modules_updates extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/joomla_plugin.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Joomla_plugin Controller
+ * Joomla_plugin Form Controller
  */
-class ComponentbuilderControllerJoomla_plugin extends JControllerForm
+class ComponentbuilderControllerJoomla_plugin extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/joomla_plugin_files_folders_urls.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Joomla_plugin_files_folders_urls Controller
+ * Joomla_plugin_files_folders_urls Form Controller
  */
-class ComponentbuilderControllerJoomla_plugin_files_folders_urls extends JControllerForm
+class ComponentbuilderControllerJoomla_plugin_files_folders_urls extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/joomla_plugin_group.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Joomla_plugin_group Controller
+ * Joomla_plugin_group Form Controller
  */
-class ComponentbuilderControllerJoomla_plugin_group extends JControllerForm
+class ComponentbuilderControllerJoomla_plugin_group extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/joomla_plugin_groups.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Joomla_plugin_groups Controller
+ * Joomla_plugin_groups Admin Controller
  */
-class ComponentbuilderControllerJoomla_plugin_groups extends JControllerAdmin
+class ComponentbuilderControllerJoomla_plugin_groups extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/joomla_plugin_updates.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Joomla_plugin_updates Controller
+ * Joomla_plugin_updates Form Controller
  */
-class ComponentbuilderControllerJoomla_plugin_updates extends JControllerForm
+class ComponentbuilderControllerJoomla_plugin_updates extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/joomla_plugins.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Joomla_plugins Controller
+ * Joomla_plugins Admin Controller
  */
-class ComponentbuilderControllerJoomla_plugins extends JControllerAdmin
+class ComponentbuilderControllerJoomla_plugins extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/joomla_plugins_files_folders_urls.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Joomla_plugins_files_folders_urls Controller
+ * Joomla_plugins_files_folders_urls Admin Controller
  */
-class ComponentbuilderControllerJoomla_plugins_files_folders_urls extends JControllerAdmin
+class ComponentbuilderControllerJoomla_plugins_files_folders_urls extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/joomla_plugins_updates.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Joomla_plugins_updates Controller
+ * Joomla_plugins_updates Admin Controller
  */
-class ComponentbuilderControllerJoomla_plugins_updates extends JControllerAdmin
+class ComponentbuilderControllerJoomla_plugins_updates extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/language.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Language Controller
+ * Language Form Controller
  */
-class ComponentbuilderControllerLanguage extends JControllerForm
+class ComponentbuilderControllerLanguage extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/language_translation.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Language_translation Controller
+ * Language_translation Form Controller
  */
-class ComponentbuilderControllerLanguage_translation extends JControllerForm
+class ComponentbuilderControllerLanguage_translation extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/language_translations.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Language_translations Controller
+ * Language_translations Admin Controller
  */
-class ComponentbuilderControllerLanguage_translations extends JControllerAdmin
+class ComponentbuilderControllerLanguage_translations extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/languages.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Languages Controller
+ * Languages Admin Controller
  */
-class ComponentbuilderControllerLanguages extends JControllerAdmin
+class ComponentbuilderControllerLanguages extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/layout.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Layout Controller
+ * Layout Form Controller
  */
-class ComponentbuilderControllerLayout extends JControllerForm
+class ComponentbuilderControllerLayout extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/layouts.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Layouts Controller
+ * Layouts Admin Controller
  */
-class ComponentbuilderControllerLayouts extends JControllerAdmin
+class ComponentbuilderControllerLayouts extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/libraries.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Libraries Controller
+ * Libraries Admin Controller
  */
-class ComponentbuilderControllerLibraries extends JControllerAdmin
+class ComponentbuilderControllerLibraries extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/libraries_config.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Libraries_config Controller
+ * Libraries_config Admin Controller
  */
-class ComponentbuilderControllerLibraries_config extends JControllerAdmin
+class ComponentbuilderControllerLibraries_config extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/libraries_files_folders_urls.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Libraries_files_folders_urls Controller
+ * Libraries_files_folders_urls Admin Controller
  */
-class ComponentbuilderControllerLibraries_files_folders_urls extends JControllerAdmin
+class ComponentbuilderControllerLibraries_files_folders_urls extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/library.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Library Controller
+ * Library Form Controller
  */
-class ComponentbuilderControllerLibrary extends JControllerForm
+class ComponentbuilderControllerLibrary extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/library_config.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Library_config Controller
+ * Library_config Form Controller
  */
-class ComponentbuilderControllerLibrary_config extends JControllerForm
+class ComponentbuilderControllerLibrary_config extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/library_files_folders_urls.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Library_files_folders_urls Controller
+ * Library_files_folders_urls Form Controller
  */
-class ComponentbuilderControllerLibrary_files_folders_urls extends JControllerForm
+class ComponentbuilderControllerLibrary_files_folders_urls extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/placeholder.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Placeholder Controller
+ * Placeholder Form Controller
  */
-class ComponentbuilderControllerPlaceholder extends JControllerForm
+class ComponentbuilderControllerPlaceholder extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/placeholders.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Placeholders Controller
+ * Placeholders Admin Controller
  */
-class ComponentbuilderControllerPlaceholders extends JControllerAdmin
+class ComponentbuilderControllerPlaceholders extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/server.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Server Controller
+ * Server Form Controller
  */
-class ComponentbuilderControllerServer extends JControllerForm
+class ComponentbuilderControllerServer extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/servers.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Servers Controller
+ * Servers Admin Controller
  */
-class ComponentbuilderControllerServers extends JControllerAdmin
+class ComponentbuilderControllerServers extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/site_view.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Site_view Controller
+ * Site_view Form Controller
  */
-class ComponentbuilderControllerSite_view extends JControllerForm
+class ComponentbuilderControllerSite_view extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/site_views.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Site_views Controller
+ * Site_views Admin Controller
  */
-class ComponentbuilderControllerSite_views extends JControllerAdmin
+class ComponentbuilderControllerSite_views extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/snippet.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Snippet Controller
+ * Snippet Form Controller
  */
-class ComponentbuilderControllerSnippet extends JControllerForm
+class ComponentbuilderControllerSnippet extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/snippet_type.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Snippet_type Controller
+ * Snippet_type Form Controller
  */
-class ComponentbuilderControllerSnippet_type extends JControllerForm
+class ComponentbuilderControllerSnippet_type extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/snippet_types.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Snippet_types Controller
+ * Snippet_types Admin Controller
  */
-class ComponentbuilderControllerSnippet_types extends JControllerAdmin
+class ComponentbuilderControllerSnippet_types extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/snippets.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Snippets Controller
+ * Snippets Admin Controller
  */
-class ComponentbuilderControllerSnippets extends JControllerAdmin
+class ComponentbuilderControllerSnippets extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/template.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Template Controller
+ * Template Form Controller
  */
-class ComponentbuilderControllerTemplate extends JControllerForm
+class ComponentbuilderControllerTemplate extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/templates.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Templates Controller
+ * Templates Admin Controller
  */
-class ComponentbuilderControllerTemplates extends JControllerAdmin
+class ComponentbuilderControllerTemplates extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.