Moved the MVC to extend the CMS MVC via namespace.

README.md

@@ -143,11 +143,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 19th May, 2022
++ *Last Build*: 25th May, 2022
 + *Version*: 2.12.17
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **286780**
++ *Line count*: **287273**
 + *Field count*: **1581**
 + *File count*: **1853**
 + *Folder count*: **261**

admin/README.txt

@@ -143,11 +143,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 19th May, 2022
++ *Last Build*: 25th May, 2022
 + *Version*: 2.12.17
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **286780**
++ *Line count*: **287273**
 + *Field count*: **1581**
 + *File count*: **1853**
 + *Folder count*: **261**

admin/compiler/joomla_3/AdminController.php

@@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access');
 ###ADMIN_VIEWS_CONTROLLER_HEADER###
 
 /**
- * ###Views### Controller
+ * ###Views### Admin Controller
  */
-class ###Component###Controller###Views### extends JControllerAdmin
+class ###Component###Controller###Views### extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/compiler/joomla_3/AdminControllerDashboard.php

@@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access');
 ###DASH_CONTROLLER_HEADER###
 
 /**
- * ###Component### Controller
+ * ###Component### Admin Controller
  */
-class ###Component###Controller###Component### extends JControllerAdmin
+class ###Component###Controller###Component### extends AdminController
 {
 
 }

admin/compiler/joomla_3/AdminController_custom_admin.php

@@ -20,11 +20,18 @@ defined('_JEXEC') or die('Restricted access');
 ###CUSTOM_ADMIN_VIEWS_CONTROLLER_HEADER###
 
 /**
- * ###SViews### Controller
+ * ###SViews### Admin Controller
  */
-class ###Component###Controller###SViews### extends JControllerAdmin
+class ###Component###Controller###SViews### extends AdminController
 {
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
 	protected $text_prefix = 'COM_###COMPONENT###_###SVIEWS###';
+
 	/**
 	 * Proxy for getModel.
 	 * @since	2.5
@@ -36,7 +43,7 @@ class ###Component###Controller###SViews### extends JControllerAdmin
 		return $model;
 	}
 
-        public function dashboard()
+	public function dashboard()
 	{
 		$this->setRedirect(JRoute::_('index.php?option=com_###component###', false));
 		return;

admin/compiler/joomla_3/AdminModel.php

@@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access');
 ###ADMIN_VIEW_MODEL_HEADER###
 
 /**
- * ###Component### ###View### Model
+ * ###Component### ###View### Admin Model
  */
-class ###Component###Model###View### extends JModelAdmin
+class ###Component###Model###View### extends AdminModel
 {
 	/**
 	 * The tab layout fields array.

admin/compiler/joomla_3/AdminModel_site.php

@@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access');
 ###SITE_ADMIN_VIEW_MODEL_HEADER###
 
 /**
- * ###Component### ###View### Model
+ * ###Component### ###View### Admin Model
  */
-class ###Component###Model###View### extends JModelAdmin
+class ###Component###Model###View### extends AdminModel
 {
 	/**
 	 * The tab layout fields array.

admin/compiler/joomla_3/BaseController.php

@@ -17,12 +17,13 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
  * General Controller of ###Component### component
  */
-class ###Component###Controller extends JControllerLegacy
+class ###Component###Controller extends BaseController
 {
 	/**
 	 * Constructor.

admin/compiler/joomla_3/BaseControllerAjax.php

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

admin/compiler/joomla_3/BaseControllerAjaxSite.php

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

admin/compiler/joomla_3/BaseControllerHelp.php

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

admin/compiler/joomla_3/BaseControllerHelp_site.php

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

admin/compiler/joomla_3/BaseControllerSITE.php

@@ -17,12 +17,13 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * ###Component### Component Controller
+ * ###Component### Component Base Controller
  */
-class ###Component###Controller extends JControllerLegacy
+class ###Component###Controller extends BaseController
 {
 	/**
 	 * Method to display a view.

admin/compiler/joomla_3/BaseController_custom_admin.php

@@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access');
 ###CUSTOM_ADMIN_VIEW_CONTROLLER_HEADER###
 
 /**
- * ###Component### ###SView### Controller
+ * ###Component### ###SView### Base Controller
  */
-class ###Component###Controller###SView### extends JControllerLegacy
+class ###Component###Controller###SView### extends BaseController
 {
 	public function __construct($config)
 	{

admin/compiler/joomla_3/BaseController_import.php

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

admin/compiler/joomla_3/BaseController_import_custom.php

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

admin/compiler/joomla_3/BaseDatabaseModel_import.php

@@ -17,15 +17,16 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Filesystem\Folder;
 use Joomla\Utilities\ArrayHelper;
 use PhpOffice\PhpSpreadsheet\IOFactory;
 
 /**
- * ###Component### Import Model
+ * ###Component### Import Base Database Model
  */
-class ###Component###ModelImport extends JModelLegacy
+class ###Component###ModelImport extends BaseDatabaseModel
 {
 	// set uploading values
 	protected $use_streams = false;

admin/compiler/joomla_3/BaseDatabaseModel_import_custom.php

@@ -17,15 +17,16 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Filesystem\Folder;
 use Joomla\Utilities\ArrayHelper;
 use PhpOffice\PhpSpreadsheet\IOFactory;
 
 /**
- * ###Component### ###View### Model
+ * ###Component### ###View### Base Database Model
  */
-class ###Component###Model###View### extends JModelLegacy
+class ###Component###Model###View### extends BaseDatabaseModel
 {
 	// set uploading values
 	protected $use_streams = false;

admin/compiler/joomla_3/FormController.php

@@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access');
 ###ADMIN_VIEW_CONTROLLER_HEADER###
 
 /**
- * ###View### Controller
+ * ###View### Form Controller
  */
-class ###Component###Controller###View### extends JControllerForm
+class ###Component###Controller###View### extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/compiler/joomla_3/FormController_custom_site.php

@@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access');
 ###SITE_VIEW_CONTROLLER_HEADER###
 
 /**
- * ###Component### ###SView### Controller
+ * ###Component### ###SView### Form Controller
  */
-class ###Component###Controller###SView### extends JControllerForm
+class ###Component###Controller###SView### extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/compiler/joomla_3/FormController_site.php

@@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access');
 ###SITE_ADMIN_VIEW_CONTROLLER_HEADER###
 
 /**
- * ###View### Controller
+ * ###View### Form Controller
  */
-class ###Component###Controller###View### extends JControllerForm
+class ###Component###Controller###View### extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/compiler/joomla_3/HtmlView_custom_admin.php

@@ -16,11 +16,13 @@ defined('_JEXEC') or die('Restricted access');
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access'); ###LICENSE_LOCKED_DEFINED######CUSTOM_ADMIN_GET_MODULE_JIMPORT###
+
 ###CUSTOM_ADMIN_VIEW_HTML_HEADER###
+
 /**
- * ###Component### View class for the ###SView###
+ * ###Component### Html View class for the ###SView###
  */
-class ###Component###View###SView### extends JViewLegacy
+class ###Component###View###SView### extends HtmlView
 {
 	// Overwriting JView display method
 	function display($tpl = null)

admin/compiler/joomla_3/HtmlView_edit.php

@@ -16,11 +16,13 @@ defined('_JEXEC') or die('Restricted access');
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED###
+
 ###ADMIN_VIEW_HTML_HEADER###
+
 /**
- * ###View### View class
+ * ###View### Html View class
  */
-class ###Component###View###View### extends JViewLegacy
+class ###Component###View###View### extends HtmlView
 {
 	/**
 	 * display method of View

admin/compiler/joomla_3/HtmlView_edit_site.php

@@ -16,11 +16,13 @@ defined('_JEXEC') or die('Restricted access');
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED###
+
 ###SITE_ADMIN_VIEW_HTML_HEADER###
+
 /**
- * ###View### View class
+ * ###View### Html View class
  */
-class ###Component###View###View### extends JViewLegacy
+class ###Component###View###View### extends HtmlView
 {
 	/**
 	 * display method of View

admin/compiler/joomla_3/HtmlView_import.php

@@ -17,10 +17,12 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED###
 
+use Joomla\CMS\MVC\View\HtmlView;
+
 /**
- * ###Component### Import View
+ * ###Component### Import Html View
  */
-class ###Component###ViewImport extends JViewLegacy
+class ###Component###ViewImport extends HtmlView
 {
 	protected $headerList;
 	protected $hasPackage = false;

admin/compiler/joomla_3/HtmlView_import_custom.php

@@ -17,10 +17,12 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED###
 
+use Joomla\CMS\MVC\View\HtmlView;
+
 /**
- * ###Component### ###View### View
+ * ###Component### ###View### Html View
  */
-class ###Component###View###View### extends JViewLegacy
+class ###Component###View###View### extends HtmlView
 {###IMPORT_DISPLAY_METHOD_CUSTOM###
 
 	/**

admin/compiler/joomla_3/HtmlView_list.php

@@ -16,11 +16,13 @@ defined('_JEXEC') or die('Restricted access');
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED###
+
 ###ADMIN_VIEWS_HTML_HEADER###
+
 /**
- * ###Component### View class for the ###Views###
+ * ###Component### Html View class for the ###Views###
  */
-class ###Component###View###Views### extends JViewLegacy
+class ###Component###View###Views### extends HtmlView
 {
 	/**
 	 * ###Views### view display method

admin/compiler/joomla_3/HtmlView_list_custom_admin.php

@@ -16,11 +16,13 @@ defined('_JEXEC') or die('Restricted access');
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED######CUSTOM_ADMIN_GET_MODULE_JIMPORT###
+
 ###CUSTOM_ADMIN_VIEWS_HTML_HEADER###
+
 /**
- * ###Component### View class for the ###SViews###
+ * ###Component### Html View class for the ###SViews###
  */
-class ###Component###View###SViews### extends JViewLegacy
+class ###Component###View###SViews### extends HtmlView
 {
 	// Overwriting JView display method
 	function display($tpl = null)

admin/compiler/joomla_3/HtmlView_list_site.php

@@ -16,11 +16,13 @@ defined('_JEXEC') or die('Restricted access');
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED######SITE_GET_MODULE_JIMPORT###
+
 ###SITE_VIEWS_HTML_HEADER###
+
 /**
- * ###Component### View class for the ###SViews###
+ * ###Component### Html View class for the ###SViews###
  */
-class ###Component###View###SViews### extends JViewLegacy
+class ###Component###View###SViews### extends HtmlView
 {
 	// Overwriting JView display method
 	function display($tpl = null)

admin/compiler/joomla_3/HtmlView_site.php

@@ -16,11 +16,13 @@ defined('_JEXEC') or die('Restricted access');
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED######SITE_GET_MODULE_JIMPORT###
+
 ###SITE_VIEW_HTML_HEADER###
+
 /**
- * ###Component### View class for the ###SView###
+ * ###Component### Html View class for the ###SView###
  */
-class ###Component###View###SView### extends JViewLegacy
+class ###Component###View###SView### extends HtmlView
 {
 	// Overwriting JView display method
 	function display($tpl = null)

admin/compiler/joomla_3/ItemModel_custom_admin.php

@@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access');
 ###CUSTOM_ADMIN_VIEW_MODEL_HEADER###
 
 /**
- * ###Component### ###SView### Model
+ * ###Component### ###SView### Item Model
  */
-class ###Component###Model###SView### extends JModelItem
+class ###Component###Model###SView### extends ItemModel
 {
 	/**
 	 * Model context string.

admin/compiler/joomla_3/ItemModel_site.php

@@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access');
 ###SITE_VIEW_MODEL_HEADER###
 
 /**
- * ###Component### ###SView### Model
+ * ###Component### ###SView### Item Model
  */
-class ###Component###Model###SView### extends JModelItem
+class ###Component###Model###SView### extends ItemModel
 {
 	/**
 	 * Model context string.

admin/compiler/joomla_3/ListModel.php

@@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access');
 ###ADMIN_VIEWS_MODEL_HEADER###
 
 /**
- * ###Views### Model
+ * ###Views### List Model
  */
-class ###Component###Model###Views### extends JModelList
+class ###Component###Model###Views### extends ListModel
 {
 	public function __construct($config = array())
 	{

admin/compiler/joomla_3/ListModelAjax.php

@@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access');
 ###AJAX_ADMIN_MODEL_HEADER###
 
 /**
- * ###Component### Ajax Model
+ * ###Component### Ajax List Model
  */
-class ###Component###ModelAjax extends JModelList
+class ###Component###ModelAjax extends ListModel
 {
 	protected $app_params;
 	

admin/compiler/joomla_3/ListModelAjaxSite.php

@@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access');
 ###AJAX_SITE_MODEL_HEADER###
 
 /**
- * ###Component### Ajax Model
+ * ###Component### Ajax List Model
  */
-class ###Component###ModelAjax extends JModelList
+class ###Component###ModelAjax extends ListModel
 {
 	protected $app_params;
 

admin/compiler/joomla_3/ListModelDASH.php

@@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access');
 ###DASH_MODEL_HEADER###
 
 /**
- * ###Component### Model
+ * ###Component### List Model
  */
-class ###Component###Model###Component### extends JModelList
+class ###Component###Model###Component### extends ListModel
 {
 	public function getIcons()
 	{

admin/compiler/joomla_3/ListModel_custom_admin.php

@@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access');
 ###CUSTOM_ADMIN_VIEWS_MODEL_HEADER###
 
 /**
- * ###Component### Model for ###SViews###
+ * ###Component### List Model for ###SViews###
  */
-class ###Component###Model###SViews### extends JModelList
+class ###Component###Model###SViews### extends ListModel
 {
 	/**
 	 * Model user data.

admin/compiler/joomla_3/ListModel_site.php

@@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access');
 ###SITE_VIEWS_MODEL_HEADER###
 
 /**
- * ###Component### Model for ###SViews###
+ * ###Component### List Model for ###SViews###
  */
-class ###Component###Model###SViews### extends JModelList
+class ###Component###Model###SViews### extends ListModel
 {
 	/**
 	 * Model user data.

admin/compiler/joomla_3/Table.php

@@ -17,6 +17,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\Table\Table;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
@@ -24,7 +25,7 @@ use Joomla\Utilities\ArrayHelper;
 /**
  * ###Views### Table class
  */
-class ###Component###Table###View### extends JTable
+class ###Component###Table###View### extends Table
 {
 	/**
 	 * Ensure the params and metadata in json encoded in the bind method

admin/compiler/joomla_3/settings.json

@@ -64,8 +64,8 @@
 				"rename": false,
 				"type": "file"
 			},
-			"JControllerLegacy.php": {
-				"naam": "JControllerLegacy.php",
+			"BaseController.php": {
+				"naam": "BaseController.php",
 				"path": "c0mp0n3nt/admin",
 				"rename": "new",
 				"newName": "controller.php",
@@ -138,8 +138,8 @@
 				"newName": "route.php",
 				"type": "file"
 			},
-			"JControllerLegacySITE.php": {
-				"naam": "JControllerLegacySITE.php",
+			"BaseControllerSITE.php": {
+				"naam": "BaseControllerSITE.php",
 				"path": "c0mp0n3nt/site",
 				"rename": "new",
 				"newName": "controller.php",
@@ -232,14 +232,14 @@
 					"rename": "Helper_",
 					"type": "emailer"
 				},
-				"DASHJControllerAdmin.php": {
+				"AdminControllerDashboard.php": {
 					"path": "c0mp0n3nt/admin/controllers",
-					"rename": "DASHJControllerAdmin",
+					"rename": "AdminControllerDashboard",
 					"type": "dashboard"
 				},
-				"DASHJModelList.php": {
+				"ListModelDASH.php": {
 					"path": "c0mp0n3nt/admin/models",
-					"rename": "DASHJModelList",
+					"rename": "ListModelDASH",
 					"type": "dashboard"
 				},
 				"DASHJViewLagacy.php": {
@@ -289,19 +289,19 @@
 					"rename": false,
 					"type": "single"
 				},
-				"JModelAdmin.php": {
+				"AdminModel.php": {
 					"path": "c0mp0n3nt/admin/models",
-					"rename": "JModelAdmin",
+					"rename": "AdminModel",
 					"type": "single"
 				},
-				"JControllerForm.php": {
+				"FormController.php": {
 					"path": "c0mp0n3nt/admin/controllers",
-					"rename": "JControllerForm",
+					"rename": "FormController",
 					"type": "single"
 				},
-				"JTable.php": {
+				"Table.php": {
 					"path": "c0mp0n3nt/admin/tables",
-					"rename": "JTable",
+					"rename": "Table",
 					"type": "single"
 				},
 				"submitbutton.js": {
@@ -309,7 +309,7 @@
 					"rename": false,
 					"type": "single"
 				},
-				"JViewLegacy_edit.php": {
+				"HtmlView_edit.php": {
 					"path": "c0mp0n3nt/admin/views/VIEW",
 					"rename": "new",
 					"newName": "view.html.php",
@@ -320,14 +320,14 @@
 					"rename": "view",
 					"type": "single"
 				},
-				"JControllerAdmin.php": {
+				"AdminController.php": {
 					"path": "c0mp0n3nt/admin/controllers",
-					"rename": "JControllerAdmin",
+					"rename": "AdminController",
 					"type": "list"
 				},
-				"JModelList.php": {
+				"ListModel.php": {
 					"path": "c0mp0n3nt/admin/models",
-					"rename": "JModelList",
+					"rename": "ListModel",
 					"type": "list"
 				},
 				"views.css": {
@@ -335,7 +335,7 @@
 					"rename": "views",
 					"type": "list"
 				},
-				"JViewLegacy_list.php": {
+				"HtmlView_list.php": {
 					"path": "c0mp0n3nt/admin/views/VIEW",
 					"rename": "new",
 					"newName": "view.html.php",
@@ -446,31 +446,31 @@
 					"rename": "JFormFieldUser",
 					"type": "fielduser"
 				},
-				"JControllerLegacyAjax.php": {
+				"BaseControllerAjax.php": {
 					"path": "c0mp0n3nt/admin/controllers",
 					"rename": "new",
 					"newName": "ajax.json.php",
 					"type": "ajax"
 				},
-				"JModelListAjax.php": {
+				"ListModelAjax.php": {
 					"path": "c0mp0n3nt/admin/models",
 					"rename": "new",
 					"newName": "ajax.php",
 					"type": "ajax"
 				},
-				"JControllerLegacy_import.php": {
+				"BaseController_import.php": {
 					"path": "c0mp0n3nt/admin/controllers",
 					"rename": "new",
 					"newName": "import.php",
 					"type": "import"
 				},
-				"JModelLegacy_import.php": {
+				"BaseDatabaseModel_import.php": {
 					"path": "c0mp0n3nt/admin/models",
 					"rename": "new",
 					"newName": "import.php",
 					"type": "import"
 				},
-				"JViewLegacy_import.php": {
+				"HtmlView_import.php": {
 					"path": "c0mp0n3nt/admin/views/import",
 					"rename": "new",
 					"newName": "view.html.php",
@@ -482,17 +482,17 @@
 					"newName": "default.php",
 					"type": "import"
 				},
-				"JControllerLegacy_import_custom.php": {
+				"BaseController_import_custom.php": {
 					"path": "c0mp0n3nt/admin/controllers",
-					"rename": "JControllerLegacy_import_custom",
+					"rename": "BaseController_import_custom",
 					"type": "customimport"
 				},
-				"JModelLegacy_import_custom.php": {
+				"BaseDatabaseModel_import_custom.php": {
 					"path": "c0mp0n3nt/admin/models",
-					"rename": "JModelLegacy_import_custom",
+					"rename": "BaseDatabaseModel_import_custom",
 					"type": "customimport"
 				},
-				"JViewLegacy_import_custom.php": {
+				"HtmlView_import_custom.php": {
 					"path": "c0mp0n3nt/admin/views/VIEW",
 					"rename": "new",
 					"newName": "view.html.php",
@@ -504,7 +504,7 @@
 					"newName": "default.php",
 					"type": "customimport"
 				},
-				"JControllerLegacyHelp.php": {
+				"BaseControllerHelp.php": {
 					"path": "c0mp0n3nt/admin/controllers",
 					"rename": "new",
 					"newName": "help.php",
@@ -527,15 +527,15 @@
 				}
 			},
 			"site": {
-				"JViewLegacy_list_site.php": {
+				"HtmlView_list_site.php": {
 					"path": "c0mp0n3nt/site/views/VIEW",
 					"rename": "new",
 					"newName": "view.html.php",
 					"type": "list"
 				},
-				"JModelList_site.php": {
+				"ListModel_site.php": {
 					"path": "c0mp0n3nt/site/models",
-					"rename": "JModelList_site",
+					"rename": "ListModel_site",
 					"type": "list"
 				},
 				"views_site.css": {
@@ -549,7 +549,7 @@
 					"newName": "default.php",
 					"type": "list"
 				},
-				"JViewLegacy_site.php": {
+				"HtmlView_site.php": {
 					"path": "c0mp0n3nt/site/views/VIEW",
 					"rename": "new",
 					"newName": "view.html.php",
@@ -560,9 +560,9 @@
 					"rename": "view_site",
 					"type": "single"
 				},
-				"JModelItem_site.php": {
+				"ItemModel_site.php": {
 					"path": "c0mp0n3nt/site/models",
-					"rename": "JModelItem_site",
+					"rename": "ItemModel_site",
 					"type": "single"
 				},
 				"default_site.php": {
@@ -642,14 +642,14 @@
 					"newName": "edit.php",
 					"type": "edit"
 				},
-				"JModelAdmin_site.php": {
+				"AdminModel_site.php": {
 					"path": "c0mp0n3nt/site/models",
-					"rename": "JModelAdmin_site",
+					"rename": "AdminModel_site",
 					"type": "edit"
 				},
-				"JControllerForm_site.php": {
+				"FormController_site.php": {
 					"path": "c0mp0n3nt/site/controllers",
-					"rename": "JControllerForm_site",
+					"rename": "FormController_site",
 					"type": "edit"
 				},
 				"submitbutton.js": {
@@ -657,7 +657,7 @@
 					"rename": false,
 					"type": "edit"
 				},
-				"JViewLegacy_edit_site.php": {
+				"HtmlView_edit_site.php": {
 					"path": "c0mp0n3nt/site/views/VIEW",
 					"rename": "new",
 					"newName": "view.html.php",
@@ -668,27 +668,27 @@
 					"rename": "view_site_edit",
 					"type": "edit"
 				},
-				"JControllerLegacyAjaxSite.php": {
+				"BaseControllerAjaxSite.php": {
 					"path": "c0mp0n3nt/site/controllers",
 					"rename": "new",
 					"newName": "ajax.json.php",
 					"type": "ajax"
 				},
-				"JModelListAjaxSite.php": {
+				"ListModelAjaxSite.php": {
 					"path": "c0mp0n3nt/site/models",
 					"rename": "new",
 					"newName": "ajax.php",
 					"type": "ajax"
 				},
-				"JControllerLegacyHelp_site.php": {
+				"BaseControllerHelp_site.php": {
 					"path": "c0mp0n3nt/site/controllers",
 					"rename": "new",
 					"newName": "help.php",
 					"type": "help"
 				},
-				"JControllerForm_custom_site.php": {
+				"FormController_custom_site.php": {
 					"path": "c0mp0n3nt/site/controllers",
-					"rename": "JControllerForm_custom_site",
+					"rename": "FormController_custom_site",
 					"type": "custom_form"
 				},
 				"submitbutton_site.js": {
@@ -709,15 +709,15 @@
 				}
 			},
 			"custom_admin": {
-				"JViewLegacy_list_custom_admin.php": {
+				"HtmlView_list_custom_admin.php": {
 					"path": "c0mp0n3nt/admin/views/VIEW",
 					"rename": "new",
 					"newName": "view.html.php",
 					"type": "list"
 				},
-				"JModelList_custom_admin.php": {
+				"ListModel_custom_admin.php": {
 					"path": "c0mp0n3nt/admin/models",
-					"rename": "JModelList_custom_admin",
+					"rename": "ListModel_custom_admin",
 					"type": "list"
 				},
 				"default_list_custom_admin.php": {
@@ -726,9 +726,9 @@
 					"newName": "default.php",
 					"type": "list"
 				},
-				"JControllerAdmin_custom_admin.php": {
+				"AdminController_custom_admin.php": {
 					"path": "c0mp0n3nt/admin/controllers",
-					"rename": "JControllerAdmin_custom_admin",
+					"rename": "AdminController_custom_admin",
 					"type": "list"
 				},
 				"views_custom_admin.css": {
@@ -741,15 +741,15 @@
 					"rename": "view_custom_admin",
 					"type": "single"
 				},
-				"JViewLegacy_custom_admin.php": {
+				"HtmlView_custom_admin.php": {
 					"path": "c0mp0n3nt/admin/views/VIEW",
 					"rename": "new",
 					"newName": "view.html.php",
 					"type": "single"
 				},
-				"JModelItem_custom_admin.php": {
+				"ItemModel_custom_admin.php": {
 					"path": "c0mp0n3nt/admin/models",
-					"rename": "JModelItem_custom_admin",
+					"rename": "ItemModel_custom_admin",
 					"type": "single"
 				},
 				"default_custom_admin.php": {
@@ -758,9 +758,9 @@
 					"newName": "default.php",
 					"type": "single"
 				},
-				"JControllerLegacy_custom_admin.php": {
+				"BaseController_custom_admin.php": {
 					"path": "c0mp0n3nt/admin/controllers",
-					"rename": "JControllerLegacy_custom_admin",
+					"rename": "BaseController_custom_admin",
 					"type": "single"
 				},
 				"default_custom_admin_template.php": {

admin/compiler/joomla_3/settings_componentbuilder.json

@@ -64,8 +64,8 @@
 				"rename": false,
 				"type": "file"
 			},
-			"JControllerLegacy.php": {
-				"naam": "JControllerLegacy.php",
+			"BaseController.php": {
+				"naam": "BaseController.php",
 				"path": "c0mp0n3nt/admin",
 				"rename": "new",
 				"newName": "controller.php",
@@ -138,8 +138,8 @@
 				"newName": "route.php",
 				"type": "file"
 			},
-			"JControllerLegacySITE.php": {
-				"naam": "JControllerLegacySITE.php",
+			"BaseControllerSITE.php": {
+				"naam": "BaseControllerSITE.php",
 				"path": "c0mp0n3nt/site",
 				"rename": "new",
 				"newName": "controller.php",
@@ -232,14 +232,14 @@
 					"rename": "Helper_",
 					"type": "emailer"
 				},
-				"DASHJControllerAdmin.php": {
+				"AdminControllerDashboard.php": {
 					"path": "c0mp0n3nt/admin/controllers",
-					"rename": "DASHJControllerAdmin",
+					"rename": "AdminControllerDashboard",
 					"type": "dashboard"
 				},
-				"DASHJModelList.php": {
+				"ListModelDASH.php": {
 					"path": "c0mp0n3nt/admin/models",
-					"rename": "DASHJModelList",
+					"rename": "ListModelDASH",
 					"type": "dashboard"
 				},
 				"DASHJViewLagacy.php": {
@@ -289,19 +289,19 @@
 					"rename": false,
 					"type": "single"
 				},
-				"JModelAdmin.php": {
+				"AdminModel.php": {
 					"path": "c0mp0n3nt/admin/models",
-					"rename": "JModelAdmin",
+					"rename": "AdminModel",
 					"type": "single"
 				},
-				"JControllerForm.php": {
+				"FormController.php": {
 					"path": "c0mp0n3nt/admin/controllers",
-					"rename": "JControllerForm",
+					"rename": "FormController",
 					"type": "single"
 				},
-				"JTable.php": {
+				"Table.php": {
 					"path": "c0mp0n3nt/admin/tables",
-					"rename": "JTable",
+					"rename": "Table",
 					"type": "single"
 				},
 				"submitbutton.js": {
@@ -309,7 +309,7 @@
 					"rename": false,
 					"type": "single"
 				},
-				"JViewLegacy_edit.php": {
+				"HtmlView_edit.php": {
 					"path": "c0mp0n3nt/admin/views/VIEW",
 					"rename": "new",
 					"newName": "view.html.php",
@@ -320,14 +320,14 @@
 					"rename": "view",
 					"type": "single"
 				},
-				"JControllerAdmin.php": {
+				"AdminController.php": {
 					"path": "c0mp0n3nt/admin/controllers",
-					"rename": "JControllerAdmin",
+					"rename": "AdminController",
 					"type": "list"
 				},
-				"JModelList.php": {
+				"ListModel.php": {
 					"path": "c0mp0n3nt/admin/models",
-					"rename": "JModelList",
+					"rename": "ListModel",
 					"type": "list"
 				},
 				"views.css": {
@@ -335,7 +335,7 @@
 					"rename": "views",
 					"type": "list"
 				},
-				"JViewLegacy_list.php": {
+				"HtmlView_list.php": {
 					"path": "c0mp0n3nt/admin/views/VIEW",
 					"rename": "new",
 					"newName": "view.html.php",
@@ -446,31 +446,31 @@
 					"rename": "JFormFieldUser",
 					"type": "fielduser"
 				},
-				"JControllerLegacyAjax.php": {
+				"BaseControllerAjax.php": {
 					"path": "c0mp0n3nt/admin/controllers",
 					"rename": "new",
 					"newName": "ajax.json.php",
 					"type": "ajax"
 				},
-				"JModelListAjax.php": {
+				"ListModelAjax.php": {
 					"path": "c0mp0n3nt/admin/models",
 					"rename": "new",
 					"newName": "ajax.php",
 					"type": "ajax"
 				},
-				"JControllerLegacy_import.php": {
+				"BaseController_import.php": {
 					"path": "c0mp0n3nt/admin/controllers",
 					"rename": "new",
 					"newName": "import.php",
 					"type": "import"
 				},
-				"JModelLegacy_import.php": {
+				"BaseDatabaseModel_import.php": {
 					"path": "c0mp0n3nt/admin/models",
 					"rename": "new",
 					"newName": "import.php",
 					"type": "import"
 				},
-				"JViewLegacy_import.php": {
+				"HtmlView_import.php": {
 					"path": "c0mp0n3nt/admin/views/import",
 					"rename": "new",
 					"newName": "view.html.php",
@@ -482,17 +482,17 @@
 					"newName": "default.php",
 					"type": "import"
 				},
-				"JControllerLegacy_import_custom.php": {
+				"BaseController_import_custom.php": {
 					"path": "c0mp0n3nt/admin/controllers",
-					"rename": "JControllerLegacy_import_custom",
+					"rename": "BaseController_import_custom",
 					"type": "customimport"
 				},
-				"JModelLegacy_import_custom.php": {
+				"BaseDatabaseModel_import_custom.php": {
 					"path": "c0mp0n3nt/admin/models",
-					"rename": "JModelLegacy_import_custom",
+					"rename": "BaseDatabaseModel_import_custom",
 					"type": "customimport"
 				},
-				"JViewLegacy_import_custom.php": {
+				"HtmlView_import_custom.php": {
 					"path": "c0mp0n3nt/admin/views/VIEW",
 					"rename": "new",
 					"newName": "view.html.php",
@@ -504,7 +504,7 @@
 					"newName": "default.php",
 					"type": "customimport"
 				},
-				"JControllerLegacyHelp.php": {
+				"BaseControllerHelp.php": {
 					"path": "c0mp0n3nt/admin/controllers",
 					"rename": "new",
 					"newName": "help.php",
@@ -527,15 +527,15 @@
 				}
 			},
 			"site": {
-				"JViewLegacy_list_site.php": {
+				"HtmlView_list_site.php": {
 					"path": "c0mp0n3nt/site/views/VIEW",
 					"rename": "new",
 					"newName": "view.html.php",
 					"type": "list"
 				},
-				"JModelList_site.php": {
+				"ListModel_site.php": {
 					"path": "c0mp0n3nt/site/models",
-					"rename": "JModelList_site",
+					"rename": "ListModel_site",
 					"type": "list"
 				},
 				"views_site.css": {
@@ -549,7 +549,7 @@
 					"newName": "default.php",
 					"type": "list"
 				},
-				"JViewLegacy_site.php": {
+				"HtmlView_site.php": {
 					"path": "c0mp0n3nt/site/views/VIEW",
 					"rename": "new",
 					"newName": "view.html.php",
@@ -560,9 +560,9 @@
 					"rename": "view_site",
 					"type": "single"
 				},
-				"JModelItem_site.php": {
+				"ItemModel_site.php": {
 					"path": "c0mp0n3nt/site/models",
-					"rename": "JModelItem_site",
+					"rename": "ItemModel_site",
 					"type": "single"
 				},
 				"default_site.php": {
@@ -642,14 +642,14 @@
 					"newName": "edit.php",
 					"type": "edit"
 				},
-				"JModelAdmin_site.php": {
+				"AdminModel_site.php": {
 					"path": "c0mp0n3nt/site/models",
-					"rename": "JModelAdmin_site",
+					"rename": "AdminModel_site",
 					"type": "edit"
 				},
-				"JControllerForm_site.php": {
+				"FormController_site.php": {
 					"path": "c0mp0n3nt/site/controllers",
-					"rename": "JControllerForm_site",
+					"rename": "FormController_site",
 					"type": "edit"
 				},
 				"submitbutton.js": {
@@ -657,7 +657,7 @@
 					"rename": false,
 					"type": "edit"
 				},
-				"JViewLegacy_edit_site.php": {
+				"HtmlView_edit_site.php": {
 					"path": "c0mp0n3nt/site/views/VIEW",
 					"rename": "new",
 					"newName": "view.html.php",
@@ -668,27 +668,27 @@
 					"rename": "view_site_edit",
 					"type": "edit"
 				},
-				"JControllerLegacyAjaxSite.php": {
+				"BaseControllerAjaxSite.php": {
 					"path": "c0mp0n3nt/site/controllers",
 					"rename": "new",
 					"newName": "ajax.json.php",
 					"type": "ajax"
 				},
-				"JModelListAjaxSite.php": {
+				"ListModelAjaxSite.php": {
 					"path": "c0mp0n3nt/site/models",
 					"rename": "new",
 					"newName": "ajax.php",
 					"type": "ajax"
 				},
-				"JControllerLegacyHelp_site.php": {
+				"BaseControllerHelp_site.php": {
 					"path": "c0mp0n3nt/site/controllers",
 					"rename": "new",
 					"newName": "help.php",
 					"type": "help"
 				},
-				"JControllerForm_custom_site.php": {
+				"FormController_custom_site.php": {
 					"path": "c0mp0n3nt/site/controllers",
-					"rename": "JControllerForm_custom_site",
+					"rename": "FormController_custom_site",
 					"type": "custom_form"
 				},
 				"submitbutton_site.js": {
@@ -709,15 +709,15 @@
 				}
 			},
 			"custom_admin": {
-				"JViewLegacy_list_custom_admin.php": {
+				"HtmlView_list_custom_admin.php": {
 					"path": "c0mp0n3nt/admin/views/VIEW",
 					"rename": "new",
 					"newName": "view.html.php",
 					"type": "list"
 				},
-				"JModelList_custom_admin.php": {
+				"ListModel_custom_admin.php": {
 					"path": "c0mp0n3nt/admin/models",
-					"rename": "JModelList_custom_admin",
+					"rename": "ListModel_custom_admin",
 					"type": "list"
 				},
 				"default_list_custom_admin.php": {
@@ -726,9 +726,9 @@
 					"newName": "default.php",
 					"type": "list"
 				},
-				"JControllerAdmin_custom_admin.php": {
+				"AdminController_custom_admin.php": {
 					"path": "c0mp0n3nt/admin/controllers",
-					"rename": "JControllerAdmin_custom_admin",
+					"rename": "AdminController_custom_admin",
 					"type": "list"
 				},
 				"views_custom_admin.css": {
@@ -741,15 +741,15 @@
 					"rename": "view_custom_admin",
 					"type": "single"
 				},
-				"JViewLegacy_custom_admin.php": {
+				"HtmlView_custom_admin.php": {
 					"path": "c0mp0n3nt/admin/views/VIEW",
 					"rename": "new",
 					"newName": "view.html.php",
 					"type": "single"
 				},
-				"JModelItem_custom_admin.php": {
+				"ItemModel_custom_admin.php": {
 					"path": "c0mp0n3nt/admin/models",
-					"rename": "JModelItem_custom_admin",
+					"rename": "ItemModel_custom_admin",
 					"type": "single"
 				},
 				"default_custom_admin.php": {
@@ -758,9 +758,9 @@
 					"newName": "default.php",
 					"type": "single"
 				},
-				"JControllerLegacy_custom_admin.php": {
+				"BaseController_custom_admin.php": {
 					"path": "c0mp0n3nt/admin/controllers",
-					"rename": "JControllerLegacy_custom_admin",
+					"rename": "BaseController_custom_admin",
 					"type": "single"
 				},
 				"default_custom_admin_template.php": {

admin/controller.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;
 
 /**
  * General Controller of Componentbuilder component
  */
-class ComponentbuilderController extends JControllerLegacy
+class ComponentbuilderController extends BaseController
 {
 	/**
 	 * Constructor.

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.