diff --git a/administrator/components/com_modules/views/module/tmpl/edit.php b/administrator/components/com_modules/views/module/tmpl/edit.php
index 78e3574b7285a..0e90feb028fca 100644
--- a/administrator/components/com_modules/views/module/tmpl/edit.php
+++ b/administrator/components/com_modules/views/module/tmpl/edit.php
@@ -199,10 +199,10 @@
 							$this->fieldset = 'description';
 							$long_description = JLayoutHelper::render('joomla.edit.fieldset', $this);
 							if (!$long_description) {
-								$truncated = JHtmlString::truncate($short_description, 550, true, false);
+								$truncated = JHtml::_('string.truncate', $short_description, 550, true, false);
 								if (strlen($truncated) > 500) {
 									$long_description = $short_description;
-									$short_description = JHtmlString::truncate($truncated, 250);
+									$short_description = JHtml::_('string.truncate', $truncated, 250);
 									if ($short_description == $long_description) {
 										$long_description = '';
 									}
diff --git a/administrator/components/com_plugins/views/plugin/tmpl/edit.php b/administrator/components/com_plugins/views/plugin/tmpl/edit.php
index 3b067386a0d34..c2e051eeb7e23 100644
--- a/administrator/components/com_plugins/views/plugin/tmpl/edit.php
+++ b/administrator/components/com_plugins/views/plugin/tmpl/edit.php
@@ -77,10 +77,10 @@
 							$this->fieldset = 'description';
 							$long_description = JLayoutHelper::render('joomla.edit.fieldset', $this);
 							if (!$long_description) {
-								$truncated = JHtmlString::truncate($short_description, 550, true, false);
+								$truncated = JHtml::_('string.truncate', $short_description, 550, true, false);
 								if (strlen($truncated) > 500) {
 									$long_description = $short_description;
-									$short_description = JHtmlString::truncate($truncated, 250);
+									$short_description = JHtml::_('string.truncate', $truncated, 250);
 									if ($short_description == $long_description) {
 										$long_description = '';
 									}
diff --git a/administrator/components/com_users/views/users/tmpl/default.php b/administrator/components/com_users/views/users/tmpl/default.php
index a23dc34040e54..76f1d5dcf2caa 100644
--- a/administrator/components/com_users/views/users/tmpl/default.php
+++ b/administrator/components/com_users/views/users/tmpl/default.php
@@ -127,15 +127,15 @@
 							$self = $loggeduser->id == $item->id;
 
 							if ($canChange) :
-								echo JHtml::_('jgrid.state', JHtmlUsers::blockStates($self), $item->block, $i, 'users.', !$self);
+								echo JHtml::_('jgrid.state', JHtml::_('users.blockStates', $self), $item->block, $i, 'users.', !$self);
 							else :
-								echo JHtml::_('jgrid.state', JHtmlUsers::blockStates($self), $item->block, $i, 'users.', false);
+								echo JHtml::_('jgrid.state', JHtml::_('users.blockStates', $self), $item->block, $i, 'users.', false);
 							endif; ?>
 						</td>
 						<td class="center hidden-phone">
 							<?php
 							$activated = empty( $item->activation) ? 0 : 1;
-							echo JHtml::_('jgrid.state', JHtmlUsers::activateStates(), $activated, $i, 'users.', (boolean) $activated);
+							echo JHtml::_('jgrid.state', JHtml::_('users.activateStates'), $activated, $i, 'users.', (boolean) $activated);
 							?>
 						</td>
 						<td>
diff --git a/administrator/templates/hathor/html/com_languages/installed/default.php b/administrator/templates/hathor/html/com_languages/installed/default.php
index 65e52f285edbb..74da92250c18f 100644
--- a/administrator/templates/hathor/html/com_languages/installed/default.php
+++ b/administrator/templates/hathor/html/com_languages/installed/default.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-JHtmlBehavior::core();
+JHtml::_('behavior.core');
 // Add specific helper files for html generation
 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
 $user     = JFactory::getUser();
diff --git a/layouts/joomla/sidebars/submenu.php b/layouts/joomla/sidebars/submenu.php
index b358a25c328f5..8dd7a8157e478 100644
--- a/layouts/joomla/sidebars/submenu.php
+++ b/layouts/joomla/sidebars/submenu.php
@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 JHtml::_('jquery.framework');
-JHtmlBehavior::core();
+JHtml::_('behavior.core');
 
 JFactory::getDocument()->addScriptDeclaration('
 	jQuery(document).ready(function($)
diff --git a/templates/beez3/html/com_contact/contact/default.php b/templates/beez3/html/com_contact/contact/default.php
index a5c49d23e3a31..b4de7cb7c4c44 100644
--- a/templates/beez3/html/com_contact/contact/default.php
+++ b/templates/beez3/html/com_contact/contact/default.php
@@ -60,8 +60,8 @@
 		<?php echo JHtml::_('sliders.panel', JText::_('COM_CONTACT_DETAILS'), 'basic-details'); ?>
 	<?php endif; ?>
 	<?php  if ($this->params->get('presentation_style') === 'tabs') : ?>
-		<?php echo JHtmlTabs::start('tabs', array('useCookie' => '1')); ?>
-		<?php echo JHtmlTabs::panel(JText::_('COM_CONTACT_DETAILS'), 'basic-details'); ?>
+		<?php echo JHtml::_('tabs.start', 'tabs', array('useCookie' => '1')); ?>
+		<?php echo JHtml::_('tabs.panel', JText::_('COM_CONTACT_DETAILS'), 'basic-details'); ?>
 
 	<?php endif; ?>
 	<?php if ($this->params->get('presentation_style') === 'plain'):?>
@@ -97,7 +97,7 @@
 			<?php echo JHtml::_('sliders.panel', JText::_('COM_CONTACT_EMAIL_FORM'), 'display-form'); ?>
 		<?php endif; ?>
 		<?php if ($this->params->get('presentation_style') === 'tabs') : ?>
-			<?php echo JHtmlTabs::panel(JText::_('COM_CONTACT_EMAIL_FORM'), 'display-form'); ?>
+			<?php echo JHtml::_('tabs.panel', JText::_('COM_CONTACT_EMAIL_FORM'), 'display-form'); ?>
 		<?php endif; ?>
 		<?php if ($this->params->get('presentation_style') === 'plain'):?>
 			<?php  echo '<h3>'. JText::_('COM_CONTACT_EMAIL_FORM').'</h3>';  ?>
@@ -116,7 +116,7 @@
 			echo JHtml::_('sliders.panel', JText::_('JGLOBAL_ARTICLES'), 'display-articles'); ?>
 		<?php endif; ?>
 		<?php if ($this->params->get('presentation_style') === 'tabs') : ?>
-			<?php echo JHtmlTabs::panel(JText::_('JGLOBAL_ARTICLES'), 'display-articles'); ?>
+			<?php echo JHtml::_('tabs.panel', JText::_('JGLOBAL_ARTICLES'), 'display-articles'); ?>
 		<?php endif; ?>
 		<?php if  ($this->params->get('presentation_style') === 'plain'):?>
 			<?php echo '<h3>'. JText::_('JGLOBAL_ARTICLES').'</h3>'; ?>
@@ -132,7 +132,7 @@
 			echo JHtml::_('sliders.panel', JText::_('COM_CONTACT_PROFILE'), 'display-profile'); ?>
 		<?php endif; ?>
 		<?php if ($this->params->get('presentation_style') === 'tabs') : ?>
-			<?php echo JHtmlTabs::panel(JText::_('COM_CONTACT_PROFILE'), 'display-profile'); ?>
+			<?php echo JHtml::_('tabs.panel', JText::_('COM_CONTACT_PROFILE'), 'display-profile'); ?>
 		<?php endif; ?>
 		<?php if ($this->params->get('presentation_style') === 'plain'):?>
 			<?php echo '<h3>'. JText::_('COM_CONTACT_PROFILE').'</h3>'; ?>
@@ -152,7 +152,7 @@
 			echo JHtml::_('sliders.panel', JText::_('COM_CONTACT_OTHER_INFORMATION'), 'display-misc'); ?>
 		<?php endif; ?>
 		<?php if ($this->params->get('presentation_style') === 'tabs') : ?>
-			<?php echo JHtmlTabs::panel(JText::_('COM_CONTACT_OTHER_INFORMATION'), 'display-misc'); ?>
+			<?php echo JHtml::_('tabs.panel', JText::_('COM_CONTACT_OTHER_INFORMATION'), 'display-misc'); ?>
 		<?php endif; ?>
 		<?php if ($this->params->get('presentation_style') === 'plain'):?>
 			<?php echo '<h3>'. JText::_('COM_CONTACT_OTHER_INFORMATION').'</h3>'; ?>
diff --git a/templates/beez3/html/com_contact/contact/default_links.php b/templates/beez3/html/com_contact/contact/default_links.php
index dbd5a9a847679..8495f3ead7c7c 100644
--- a/templates/beez3/html/com_contact/contact/default_links.php
+++ b/templates/beez3/html/com_contact/contact/default_links.php
@@ -13,7 +13,7 @@
 	<?php echo JHtml::_('sliders.panel', JText::_('COM_CONTACT_LINKS'), 'display-links'); ?>
 <?php endif; ?>
 <?php if ($this->params->get('presentation_style') === 'tabs') : ?>
-	<?php echo JHtmlTabs::panel(JText::_('COM_CONTACT_LINKS'), 'display-links'); ?>
+	<?php echo JHtml::_('tabs.panel', JText::_('COM_CONTACT_LINKS'), 'display-links'); ?>
 <?php endif; ?>
 <?php if  ($this->params->get('presentation_style') === 'plain'):?>
 	<?php echo '<h3>'. JText::_('COM_CONTACT_LINKS').'</h3>'; ?>
diff --git a/templates/beez3/html/com_contact/contact/default_user_custom_fields.php b/templates/beez3/html/com_contact/contact/default_user_custom_fields.php
index a490b28619fc6..c31ce7626c605 100644
--- a/templates/beez3/html/com_contact/contact/default_user_custom_fields.php
+++ b/templates/beez3/html/com_contact/contact/default_user_custom_fields.php
@@ -35,7 +35,7 @@
 		echo JHtml::_('sliders.panel', $groupTitle ?: JText::_('COM_CONTACT_USER_FIELDS'), 'display-' . $id); ?>
 	<?php endif; ?>
 	<?php if ($this->params->get('presentation_style') === 'tabs') : ?>
-		<?php echo JHtmlTabs::panel($groupTitle ?: JText::_('COM_CONTACT_USER_FIELDS'), 'display-' . $id); ?>
+		<?php echo JHtml::_('tabs.panel', $groupTitle ?: JText::_('COM_CONTACT_USER_FIELDS'), 'display-' . $id); ?>
 	<?php endif; ?>
 	<?php if ($this->params->get('presentation_style') === 'plain'):?>
 		<?php echo '<h3>' . ($groupTitle ?: JText::_('COM_CONTACT_USER_FIELDS')) . '</h3>'; ?>
diff --git a/templates/protostar/component.php b/templates/protostar/component.php
index 59d529329c3dd..ff50184f3b385 100644
--- a/templates/protostar/component.php
+++ b/templates/protostar/component.php
@@ -29,7 +29,7 @@
 JHtml::_('stylesheet', 'template.css', array('version' => 'auto', 'relative' => true));
 
 // Load optional rtl Bootstrap css and Bootstrap bugfixes
-JHtmlBootstrap::loadCss($includeMaincss = false, $this->direction);
+JHtml::_('bootstrap.loadCss', $includeMaincss = false, $this->direction);
 ?>
 <!DOCTYPE html>
 <html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">