diff --git a/libraries/src/Installer/Adapter/ComponentAdapter.php b/libraries/src/Installer/Adapter/ComponentAdapter.php
index 9792cb303df81..926bf9fb9a844 100644
--- a/libraries/src/Installer/Adapter/ComponentAdapter.php
+++ b/libraries/src/Installer/Adapter/ComponentAdapter.php
@@ -603,11 +603,11 @@ public function prepareDiscoverInstall()
 			$db = $this->db;
 
 			$query = $db->getQuery(true)
-				->select($db->qn('extension_id'))
-				->from($db->qn('#__extensions'))
-				->where($db->qn('name') . ' = :name')
-				->where($db->qn('type') . ' = :type')
-				->where($db->qn('element') . ' = :element')
+				->select($db->quoteName('extension_id'))
+				->from($db->quoteName('#__extensions'))
+				->where($db->quoteName('name') . ' = :name')
+				->where($db->quoteName('type') . ' = :type')
+				->where($db->quoteName('element') . ' = :element')
 				->bind(':name', $name)
 				->bind(':type', $type)
 				->bind(':element', $element);
@@ -797,11 +797,11 @@ protected function storeExtension($deleteExisting = false)
 			$db = $this->db;
 
 			$query = $db->getQuery(true)
-				->select($db->qn('extension_id'))
-				->from($db->qn('#__extensions'))
-				->where($db->qn('name') . ' = :name')
-				->where($db->qn('type') . ' = :type')
-				->where($db->qn('element') . ' = :element')
+				->select($db->quoteName('extension_id'))
+				->from($db->quoteName('#__extensions'))
+				->where($db->quoteName('name') . ' = :name')
+				->where($db->quoteName('type') . ' = :type')
+				->where($db->quoteName('element') . ' = :element')
 				->bind(':name', $name)
 				->bind(':type', $type)
 				->bind(':element', $element);
@@ -1092,7 +1092,7 @@ protected function _removeAdminMenus($id)
 			->select('id')
 			->from('#__menu')
 			->where($db->quoteName('client_id') . ' = 1')
-			->where($db->quoteName('menutype') . ' = ' . $db->q('main'))
+			->where($db->quoteName('menutype') . ' = ' . $db->quote('main'))
 			->where($db->quoteName('component_id') . ' = :id')
 			->bind(':id', $id, ParameterType::INTEGER);
 
@@ -1161,7 +1161,7 @@ protected function _updateMenus($component_id, $clientId = null)
 			->where('type = ' . $db->quote('component'))
 			->where('('
 				. 'link LIKE ' . $db->quote('index.php?option=' . $option) . ' OR '
-				. 'link LIKE ' . $db->q($db->escape('index.php?option=' . $option . '&') . '%', false)
+				. 'link LIKE ' . $db->quote($db->escape('index.php?option=' . $option . '&') . '%', false)
 				. ')');
 
 		if (isset($clientId))
diff --git a/libraries/src/Installer/Adapter/LanguageAdapter.php b/libraries/src/Installer/Adapter/LanguageAdapter.php
index 71651e4c6b639..869c1702e36fb 100644
--- a/libraries/src/Installer/Adapter/LanguageAdapter.php
+++ b/libraries/src/Installer/Adapter/LanguageAdapter.php
@@ -616,8 +616,8 @@ protected function getSefString($itemLanguageTag)
 		// Get the sef value of all current content languages.
 		$db = Factory::getDbo();
 		$query = $db->getQuery(true)
-			->select($db->qn('sef'))
-			->from($db->qn('#__languages'));
+			->select($db->quoteName('sef'))
+			->from($db->quoteName('#__languages'));
 		$db->setQuery($query);
 
 		$siteLanguages = $db->loadObjectList();