diff --git a/administrator/components/com_mails/tmpl/templates/default.php b/administrator/components/com_mails/tmpl/templates/default.php
index 82b7932a7ef62..c5ffe05c14e8b 100644
--- a/administrator/components/com_mails/tmpl/templates/default.php
+++ b/administrator/components/com_mails/tmpl/templates/default.php
@@ -68,9 +68,9 @@
 											<?php foreach ($this->languages as $language) : ?>
 												<a class="dropdown-item" href="<?php echo Route::_('index.php?option=com_mails&task=template.edit&template_id=' . $item->template_id . '&language=' . $language->lang_code); ?>">
 													<?php if (in_array($language->lang_code, $item->languages)) : ?>
-														<?php echo JText::sprintf('COM_MAILS_LIST_EDIT_TEMPLATE', $language->title); ?>
+														<?php echo Text::sprintf('COM_MAILS_LIST_EDIT_TEMPLATE', $language->title); ?>
 													<?php else: ?>
-														<?php echo JText::sprintf('COM_MAILS_LIST_CREATE_TEMPLATE', $language->title); ?>
+														<?php echo Text::sprintf('COM_MAILS_LIST_CREATE_TEMPLATE', $language->title); ?>
 													<?php endif; ?>
 												</a>
 											<?php endforeach; ?>
diff --git a/components/com_contact/tmpl/contact/default.php b/components/com_contact/tmpl/contact/default.php
index 76ba7cdc750e9..873f4a04ccbd7 100644
--- a/components/com_contact/tmpl/contact/default.php
+++ b/components/com_contact/tmpl/contact/default.php
@@ -45,7 +45,7 @@
 		<div class="icons">
 			<div class="btn-group float-right">
 				<button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton-<?php echo $this->item->id; ?>"
-					aria-label="<?php echo JText::_('JUSER_TOOLS'); ?>"
+					aria-label="<?php echo Text::_('JUSER_TOOLS'); ?>"
 					data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 					<span class="fas fa-cog" aria-hidden="true"></span>
 				</button>
diff --git a/libraries/src/Form/Form.php b/libraries/src/Form/Form.php
index 2501d81d68e59..2abe33fc14ad0 100644
--- a/libraries/src/Form/Form.php
+++ b/libraries/src/Form/Form.php
@@ -1198,11 +1198,11 @@ public function validate($data, $group = null)
 			// Define field name for messages
 			if ($field['label'])
 			{
-				$fieldLabel = \JText::_($field['label']);
+				$fieldLabel = Text::_($field['label']);
 			}
 			else
 			{
-				$fieldLabel = \JText::_($name);
+				$fieldLabel = Text::_($name);
 			}
 
 			$disabled = ((string) $field['disabled'] === 'true' || (string) $field['disabled'] === 'disabled');
diff --git a/libraries/src/Installer/Adapter/LibraryAdapter.php b/libraries/src/Installer/Adapter/LibraryAdapter.php
index 877f78c972e08..368e97264cf24 100644
--- a/libraries/src/Installer/Adapter/LibraryAdapter.php
+++ b/libraries/src/Installer/Adapter/LibraryAdapter.php
@@ -326,7 +326,7 @@ protected function setupInstallPaths()
 
 		if (in_array($group, $restrictedFolders))
 		{
-			throw new \RuntimeException(\JText::_('JLIB_INSTALLER_ABORT_LIB_INSTALL_CORE_FOLDER'));
+			throw new \RuntimeException(Text::_('JLIB_INSTALLER_ABORT_LIB_INSTALL_CORE_FOLDER'));
 		}
 
 		$this->parent->setPath('extension_root', JPATH_PLATFORM . '/' . implode(DIRECTORY_SEPARATOR, explode('/', $group)));
diff --git a/libraries/src/MVC/Model/AdminModel.php b/libraries/src/MVC/Model/AdminModel.php
index 8434153fb1216..983efd736101a 100644
--- a/libraries/src/MVC/Model/AdminModel.php
+++ b/libraries/src/MVC/Model/AdminModel.php
@@ -1470,7 +1470,7 @@ public function save($data)
 
 			if ($id == 0)
 			{
-				$app->enqueueMessage(\JText::_('JGLOBAL_ASSOCIATIONS_NEW_ITEM_WARNING'), 'error');
+				$app->enqueueMessage(Text::_('JGLOBAL_ASSOCIATIONS_NEW_ITEM_WARNING'), 'error');
 				$app->redirect(
 					\JRoute::_('index.php?option=' . $component . '&view=' . $view . $client . '&layout=edit&id=' . $id . $extension, false)
 				);
@@ -1480,7 +1480,7 @@ public function save($data)
 
 			if ($data['language'] === '*')
 			{
-				$app->enqueueMessage(\JText::_('JGLOBAL_ASSOC_NOT_POSSIBLE'), 'notice');
+				$app->enqueueMessage(Text::_('JGLOBAL_ASSOC_NOT_POSSIBLE'), 'notice');
 				$app->redirect(
 					\JRoute::_('index.php?option=' . $component . '&view=' . $view . $client . '&layout=edit&id=' . $id . $extension, false)
 				);
diff --git a/plugins/quickicon/phpversioncheck/phpversioncheck.php b/plugins/quickicon/phpversioncheck/phpversioncheck.php
index de05dc5660db0..672d98905d44d 100644
--- a/plugins/quickicon/phpversioncheck/phpversioncheck.php
+++ b/plugins/quickicon/phpversioncheck/phpversioncheck.php
@@ -154,11 +154,11 @@ private function getPhpSupport()
 					if (version_compare($version, $activePhpVersion, 'ge') && ($today < $versionEndOfSupport))
 					{
 						$supportStatus['status']  = self::PHP_UNSUPPORTED;
-						$supportStatus['message'] = JText::sprintf(
+						$supportStatus['message'] = Text::sprintf(
 							'PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED',
 							PHP_VERSION,
 							$version,
-							$versionEndOfSupport->format(JText::_('DATE_FORMAT_LC4'))
+							$versionEndOfSupport->format(Text::_('DATE_FORMAT_LC4'))
 						);
 
 						return $supportStatus;