diff --git a/administrator/components/com_installer/Model/DatabaseModel.php b/administrator/components/com_installer/Model/DatabaseModel.php
index c5adc8682477d..8511e23c6f91f 100644
--- a/administrator/components/com_installer/Model/DatabaseModel.php
+++ b/administrator/components/com_installer/Model/DatabaseModel.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Mvc\Factory\MvcFactoryInterface;
+use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Schema\ChangeSet;
 use Joomla\CMS\Table\Extension;
 use Joomla\CMS\Version;
@@ -62,12 +62,12 @@ class DatabaseModel extends InstallerModel
 	 * Constructor.
 	 *
 	 * @param   array                $config   An optional associative array of configuration settings.
-	 * @param   MvcFactoryInterface  $factory  The factory.
+	 * @param   MVCFactoryInterface  $factory  The factory.
 	 *
 	 * @see     ListModel
 	 * @since   4.0.0
 	 */
-	public function __construct($config = array(), MvcFactoryInterface $factory = null)
+	public function __construct($config = array(), MVCFactoryInterface $factory = null)
 	{
 		if (empty($config['filter_fields']))
 		{
diff --git a/administrator/components/com_workflow/Controller/DisplayController.php b/administrator/components/com_workflow/Controller/DisplayController.php
index 504308afa5171..115509e77b5f6 100644
--- a/administrator/components/com_workflow/Controller/DisplayController.php
+++ b/administrator/components/com_workflow/Controller/DisplayController.php
@@ -12,7 +12,7 @@
 defined('_JEXEC') or die;
 
 use Joomla\Component\Categories\Administrator\Helper\CategoriesHelper;
-use Joomla\CMS\Mvc\Factory\MvcFactoryInterface;
+use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Controller\BaseController;
 
 /**
@@ -42,13 +42,13 @@ class DisplayController extends BaseController
 	 * Constructor.
 	 *
 	 * @param   array                $config   An optional associative array of configuration settings.
-	 * @param   MvcFactoryInterface  $factory  The factory.
+	 * @param   MVCFactoryInterface  $factory  The factory.
 	 * @param   CMSApplication       $app      The JApplication for the dispatcher
 	 * @param   \JInput              $input    Input
 	 *
 	 * @since  __DEPLOY_VERSION__
 	 */
-	public function __construct($config = array(), MvcFactoryInterface $factory = null, $app = null, $input = null)
+	public function __construct($config = array(), MVCFactoryInterface $factory = null, $app = null, $input = null)
 	{
 		parent::__construct($config, $factory, $app, $input);
 
diff --git a/administrator/components/com_workflow/Controller/StateController.php b/administrator/components/com_workflow/Controller/StateController.php
index 697a18fa6a48e..2851e8986b296 100644
--- a/administrator/components/com_workflow/Controller/StateController.php
+++ b/administrator/components/com_workflow/Controller/StateController.php
@@ -11,7 +11,7 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Mvc\Factory\MvcFactoryInterface;
+use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Controller\FormController;
 
 /**
@@ -43,14 +43,14 @@ class StateController extends FormController
 	 * Constructor.
 	 *
 	 * @param   array                $config   An optional associative array of configuration settings.
-	 * @param   MvcFactoryInterface  $factory  The factory.
+	 * @param   MVCFactoryInterface  $factory  The factory.
 	 * @param   \CMSApplication      $app      The JApplication for the dispatcher
 	 * @param   \JInput              $input    Input
 	 *
 	 * @since  __DEPLOY_VERSION__
 	 * @see    \JControllerLegacy
 	 */
-	public function __construct($config = array(), MvcFactoryInterface $factory = null, $app = null, $input = null)
+	public function __construct($config = array(), MVCFactoryInterface $factory = null, $app = null, $input = null)
 	{
 		parent::__construct($config, $factory, $app, $input);
 
diff --git a/administrator/components/com_workflow/Controller/StatesController.php b/administrator/components/com_workflow/Controller/StatesController.php
index aa152d35d7b1f..1fe50790a7ff1 100644
--- a/administrator/components/com_workflow/Controller/StatesController.php
+++ b/administrator/components/com_workflow/Controller/StatesController.php
@@ -10,7 +10,7 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Mvc\Factory\MvcFactoryInterface;
+use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\CMS\Language\Text;
@@ -30,13 +30,13 @@ class StatesController extends AdminController
 	 * @param   array                $config   An optional associative array of configuration settings.
 	 *                                         Recognized key values include 'name', 'default_task', 'model_path', and
 	 *                                         'view_path' (this list is not meant to be comprehensive).
-	 * @param   MvcFactoryInterface  $factory  The factory.
+	 * @param   MVCFactoryInterface  $factory  The factory.
 	 * @param   CmsApplication       $app      The JApplication for the dispatcher
 	 * @param   \JInput              $input    Input
 	 *
 	 * @since  __DEPLOY_VERSION__
 	 */
-	public function __construct(array $config = array(), MvcFactoryInterface $factory = null, $app = null, $input = null)
+	public function __construct(array $config = array(), MVCFactoryInterface $factory = null, $app = null, $input = null)
 	{
 		parent::__construct($config, $factory, $app, $input);
 
diff --git a/administrator/components/com_workflow/Controller/TransitionController.php b/administrator/components/com_workflow/Controller/TransitionController.php
index 8579a3aa81763..308219ed946a3 100644
--- a/administrator/components/com_workflow/Controller/TransitionController.php
+++ b/administrator/components/com_workflow/Controller/TransitionController.php
@@ -11,7 +11,7 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Mvc\Factory\MvcFactoryInterface;
+use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Controller\FormController;
 
 /**
@@ -43,14 +43,14 @@ class TransitionController extends FormController
 	 * Constructor.
 	 *
 	 * @param   array                $config   An optional associative array of configuration settings.
-	 * @param   MvcFactoryInterface  $factory  The factory.
+	 * @param   MVCFactoryInterface  $factory  The factory.
 	 * @param   \CMSApplication      $app      The JApplication for the dispatcher
 	 * @param   \JInput              $input    Input
 	 *
 	 * @since  __DEPLOY_VERSION__
 	 * @see    \JControllerLegacy
 	 */
-	public function __construct($config = array(), MvcFactoryInterface $factory = null, $app = null, $input = null)
+	public function __construct($config = array(), MVCFactoryInterface $factory = null, $app = null, $input = null)
 	{
 		parent::__construct($config, $factory, $app, $input);
 
diff --git a/administrator/components/com_workflow/Controller/WorkflowController.php b/administrator/components/com_workflow/Controller/WorkflowController.php
index 8876255948fdc..2f9c61a7497ff 100644
--- a/administrator/components/com_workflow/Controller/WorkflowController.php
+++ b/administrator/components/com_workflow/Controller/WorkflowController.php
@@ -11,7 +11,7 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Mvc\Factory\MvcFactoryInterface;
+use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Controller\FormController;
 
 /**
@@ -35,14 +35,14 @@ class WorkflowController extends FormController
 	 * Constructor.
 	 *
 	 * @param   array                $config   An optional associative array of configuration settings.
-	 * @param   MvcFactoryInterface  $factory  The factory.
+	 * @param   MVCFactoryInterface  $factory  The factory.
 	 * @param   \CMSApplication      $app      The JApplication for the dispatcher
 	 * @param   \JInput              $input    Input
 	 *
 	 * @since  __DEPLOY_VERSION__
 	 * @see    \JControllerLegacy
 	 */
-	public function __construct($config = array(), MvcFactoryInterface $factory = null, $app = null, $input = null)
+	public function __construct($config = array(), MVCFactoryInterface $factory = null, $app = null, $input = null)
 	{
 		parent::__construct($config, $factory, $app, $input);
 
diff --git a/administrator/components/com_workflow/Controller/WorkflowsController.php b/administrator/components/com_workflow/Controller/WorkflowsController.php
index bbff925541070..d7b0ccf6f4c0d 100644
--- a/administrator/components/com_workflow/Controller/WorkflowsController.php
+++ b/administrator/components/com_workflow/Controller/WorkflowsController.php
@@ -11,7 +11,7 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\CMS\Mvc\Factory\MvcFactoryInterface;
+use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Language\Text;
 
@@ -30,13 +30,13 @@ class WorkflowsController extends AdminController
 	 * @param   array                $config   An optional associative array of configuration settings.
 	 *                                         Recognized key values include 'name', 'default_task', 'model_path', and
 	 *                                         'view_path' (this list is not meant to be comprehensive).
-	 * @param   MvcFactoryInterface  $factory  The factory.
+	 * @param   MVCFactoryInterface  $factory  The factory.
 	 * @param   CmsApplication       $app      The JApplication for the dispatcher
 	 * @param   \JInput              $input    Input
 	 *
 	 * @since  __DEPLOY_VERSION__
 	 */
-	public function __construct(array $config = array(), MvcFactoryInterface $factory = null, $app = null, $input = null)
+	public function __construct(array $config = array(), MVCFactoryInterface $factory = null, $app = null, $input = null)
 	{
 		parent::__construct($config, $factory, $app, $input);
 		$this->registerTask('unsetDefault',	'setDefault');