diff --git a/componentbuildersiteheaderstabs.xml b/componentbuildersiteheaderstabs.xml
index 768a675..68d73f1 100644
--- a/componentbuildersiteheaderstabs.xml
+++ b/componentbuildersiteheaderstabs.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="plugin" version="4" group="content" method="upgrade">
-	<name>PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS</name>
-	<creationDate>10th March, 2022</creationDate>
+	<name>PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS</name>
+	<creationDate>9th May, 2022</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>https://dev.vdm.io</authorUrl>
 	<copyright>Copyright (C) 2015 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<version>1.0.4</version>
-	<description>PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_XML_DESCRIPTION</description>
+	<description>PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_XML_DESCRIPTION</description>
 
 	<!-- Scripts to run on installation -->
 	<scriptfile>script.php</scriptfile>
diff --git a/fields/powers.php b/fields/powers.php
index 9e362c6..37c857a 100644
--- a/fields/powers.php
+++ b/fields/powers.php
@@ -82,7 +82,7 @@ class JFormFieldPowers extends JFormFieldList
 			if ($user->authorise('power.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
 			{
 				// build Create button
-				$button[] = '<a id="'.$button_code_name.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('PLG_CONTENTCOMPONENTBUILDERCOMPONENTHEADERSTABS_CREATE_NEW_S', $button_label).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
+				$button[] = '<a id="'.$button_code_name.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_CREATE_NEW_S', $button_label).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
 					href="index.php?option=com_componentbuilder&amp;view=power&amp;layout=edit'.$ref.'" >
 					<span class="icon-new icon-white"></span></a>';
 			}
@@ -90,7 +90,7 @@ class JFormFieldPowers extends JFormFieldList
 			if ($user->authorise('power.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
 			{
 				// build edit button
-				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('PLG_CONTENTCOMPONENTBUILDERCOMPONENTHEADERSTABS_EDIT_S', $button_label).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
+				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_EDIT_S', $button_label).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
 					<span class="icon-edit"></span></a>';
 				// build script
 				$script[] = "
@@ -144,7 +144,7 @@ class JFormFieldPowers extends JFormFieldList
 		// Get the databse object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.id','a.system_name','a.name','a.type','a.power_version'),array('id','power_admin_component_system_name','name','type','version')));
+		$query->select($db->quoteName(array('a.guid','a.system_name','a.name','a.type','a.power_version'),array('guid','power_admin_component_system_name','name','type','version')));
 		$query->from($db->quoteName('#__componentbuilder_power', 'a'));
 		$query->where($db->quoteName('a.published') . ' >= 1');
 		$query->order('a.system_name ASC');
@@ -165,17 +165,17 @@ class JFormFieldPowers extends JFormFieldList
 		// if none was found, we add this to set an alternative to set custom
 		if (!$items)
 		{
-			$options[] = JHtml::_('select.option', '', JText::_('PLG_CONTENTCOMPONENTBUILDERCOMPONENTHEADERSTABS_NONE_FOUND'));
+			$options[] = JHtml::_('select.option', '', JText::_('PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_NONE_FOUND'));
 		}
 		if ($items)
 		{
 			if ($this->multiple === false)
 			{
-				$options[] = JHtml::_('select.option', '', JText::_('PLG_CONTENTCOMPONENTBUILDERCOMPONENTHEADERSTABS_SELECT_AN_OPTION'));
+				$options[] = JHtml::_('select.option', '', JText::_('PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_SELECT_AN_OPTION'));
 			}
 			foreach($items as $item)
 			{
-				$options[] = JHtml::_('select.option', $item->id, $item->power_admin_component_system_name . ' [' . $item->type . ' ' . $item->name . '] (v' . $item->version . ')');
+				$options[] = JHtml::_('select.option', $item->guid, $item->power_admin_component_system_name . ' [' . $item->type . ' ' . $item->name . '] (v' . $item->version . ')');
 			}
 		}
 		return $options;
diff --git a/forms/site_view.xml b/forms/site_view.xml
index b56e2be..237176a 100644
--- a/forms/site_view.xml
+++ b/forms/site_view.xml
@@ -3,7 +3,7 @@
 <form>
 	<fields name="params">
 	<!-- default paths of site_view_headers fieldset points to the plugin -->
-	<fieldset name="site_view_headers" label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_CLASS_HEADERS"
+	<fieldset name="site_view_headers" label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_CLASS_HEADERS"
 		addrulepath="/plugins/content/componentbuildersiteheaderstabs/rules"
 		addfieldpath="/plugins/content/componentbuildersiteheaderstabs/fields"
 	>
@@ -12,23 +12,23 @@
 		<field
 			type="radio"
 			name="add_site_view_model"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_MODEL_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_MODEL_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_MODEL_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_MODEL_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
 			<!-- Option Set. -->
 			<option value="1">
-				PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_YES</option>
+				PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_YES</option>
 			<option value="0">
-				PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_NO</option>
+				PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_NO</option>
 		</field>
 		<!-- Site_view_model Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
 			name="site_view_model"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_MODEL_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_MODEL_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_MODEL_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_MODEL_DESCRIPTION"
 			width="100%"
 			height="100px"
 			cols="15"
@@ -45,8 +45,8 @@
 		<field
 			type="powers"
 			name="power_site_view_model"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_MODEL_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_MODEL_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_MODEL_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_MODEL_DESCRIPTION"
 			class="list_class span12"
 			multiple="true"
 			default="0"
@@ -58,23 +58,23 @@
 		<field
 			type="radio"
 			name="add_site_view_html"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_HTML_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_HTML_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_HTML_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_HTML_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
 			<!-- Option Set. -->
 			<option value="1">
-				PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_YES</option>
+				PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_YES</option>
 			<option value="0">
-				PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_NO</option>
+				PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_NO</option>
 		</field>
 		<!-- Site_view_html Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
 			name="site_view_html"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_HTML_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_HTML_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_HTML_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_HTML_DESCRIPTION"
 			width="100%"
 			height="100px"
 			cols="15"
@@ -91,8 +91,8 @@
 		<field
 			type="powers"
 			name="power_site_view_html"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_HTML_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_HTML_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_HTML_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_HTML_DESCRIPTION"
 			class="list_class span12"
 			multiple="true"
 			default="0"
@@ -104,23 +104,23 @@
 		<field
 			type="radio"
 			name="add_site_view"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
 			<!-- Option Set. -->
 			<option value="1">
-				PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_YES</option>
+				PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_YES</option>
 			<option value="0">
-				PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_NO</option>
+				PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_NO</option>
 		</field>
 		<!-- Site_view Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
 			name="site_view"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_DESCRIPTION"
 			width="100%"
 			height="100px"
 			cols="15"
@@ -137,8 +137,8 @@
 		<field
 			type="powers"
 			name="power_site_view"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_DESCRIPTION"
 			class="list_class span12"
 			multiple="true"
 			default="0"
@@ -150,23 +150,23 @@
 		<field
 			type="radio"
 			name="add_site_view_controller"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_CONTROLLER_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_CONTROLLER_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_CONTROLLER_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_CONTROLLER_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
 			<!-- Option Set. -->
 			<option value="1">
-				PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_YES</option>
+				PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_YES</option>
 			<option value="0">
-				PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_NO</option>
+				PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_NO</option>
 		</field>
 		<!-- Site_view_controller Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
 			name="site_view_controller"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_CONTROLLER_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_CONTROLLER_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_CONTROLLER_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_CONTROLLER_DESCRIPTION"
 			width="100%"
 			height="100px"
 			cols="15"
@@ -183,8 +183,8 @@
 		<field
 			type="powers"
 			name="power_site_view_controller"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_CONTROLLER_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_CONTROLLER_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_CONTROLLER_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_CONTROLLER_DESCRIPTION"
 			class="list_class span12"
 			multiple="true"
 			default="0"
@@ -196,23 +196,23 @@
 		<field
 			type="radio"
 			name="add_site_views_model"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_MODEL_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_MODEL_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_MODEL_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_MODEL_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
 			<!-- Option Set. -->
 			<option value="1">
-				PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_YES</option>
+				PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_YES</option>
 			<option value="0">
-				PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_NO</option>
+				PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_NO</option>
 		</field>
 		<!-- Site_views_model Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
 			name="site_views_model"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_MODEL_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_MODEL_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_MODEL_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_MODEL_DESCRIPTION"
 			width="100%"
 			height="100px"
 			cols="15"
@@ -229,8 +229,8 @@
 		<field
 			type="powers"
 			name="power_site_views_model"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_MODEL_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_MODEL_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_MODEL_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_MODEL_DESCRIPTION"
 			class="list_class span12"
 			multiple="true"
 			default="0"
@@ -242,23 +242,23 @@
 		<field
 			type="radio"
 			name="add_site_views_html"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_HTML_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_HTML_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_HTML_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_HTML_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
 			<!-- Option Set. -->
 			<option value="1">
-				PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_YES</option>
+				PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_YES</option>
 			<option value="0">
-				PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_NO</option>
+				PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_NO</option>
 		</field>
 		<!-- Site_views_html Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
 			name="site_views_html"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_HTML_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_HTML_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_HTML_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_HTML_DESCRIPTION"
 			width="100%"
 			height="100px"
 			cols="15"
@@ -275,8 +275,8 @@
 		<field
 			type="powers"
 			name="power_site_views_html"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_HTML_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_HTML_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_HTML_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_HTML_DESCRIPTION"
 			class="list_class span12"
 			multiple="true"
 			default="0"
@@ -288,23 +288,23 @@
 		<field
 			type="radio"
 			name="add_site_views"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
 			<!-- Option Set. -->
 			<option value="1">
-				PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_YES</option>
+				PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_YES</option>
 			<option value="0">
-				PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_NO</option>
+				PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_NO</option>
 		</field>
 		<!-- Site_views Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
 			name="site_views"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_DESCRIPTION"
 			width="100%"
 			height="100px"
 			cols="15"
@@ -321,8 +321,8 @@
 		<field
 			type="powers"
 			name="power_site_views"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_DESCRIPTION"
 			class="list_class span12"
 			multiple="true"
 			default="0"
@@ -334,23 +334,23 @@
 		<field
 			type="radio"
 			name="add_site_views_controller"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_CONTROLLER_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_CONTROLLER_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_CONTROLLER_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_CONTROLLER_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
 			<!-- Option Set. -->
 			<option value="1">
-				PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_YES</option>
+				PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_YES</option>
 			<option value="0">
-				PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_NO</option>
+				PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_NO</option>
 		</field>
 		<!-- Site_views_controller Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
 			name="site_views_controller"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_CONTROLLER_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_CONTROLLER_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_CONTROLLER_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_CONTROLLER_DESCRIPTION"
 			width="100%"
 			height="100px"
 			cols="15"
@@ -367,8 +367,8 @@
 		<field
 			type="powers"
 			name="power_site_views_controller"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_CONTROLLER_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_CONTROLLER_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_CONTROLLER_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_CONTROLLER_DESCRIPTION"
 			class="list_class span12"
 			multiple="true"
 			default="0"
@@ -380,22 +380,22 @@
 		<field
 			type="radio"
 			name="add_ajax_model"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_AJAX_MODEL_LABEL"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_AJAX_MODEL_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
 			<!-- Option Set. -->
 			<option value="1">
-				PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_YES</option>
+				PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_YES</option>
 			<option value="0">
-				PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_NO</option>
+				PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_NO</option>
 		</field>
 		<!-- Ajax_model Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
 			name="ajax_model"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_AJAX_MODEL_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_AJAX_MODEL_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_AJAX_MODEL_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_AJAX_MODEL_DESCRIPTION"
 			width="100%"
 			height="100px"
 			cols="15"
@@ -412,8 +412,8 @@
 		<field
 			type="powers"
 			name="power_ajax_model"
-			label="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_AJAX_MODEL_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_AJAX_MODEL_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_AJAX_MODEL_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_AJAX_MODEL_DESCRIPTION"
 			class="list_class span12"
 			multiple="true"
 			default="0"
diff --git a/language/en-GB/en-GB.plg_content_componentbuildersiteheaderstabs.ini b/language/en-GB/en-GB.plg_content_componentbuildersiteheaderstabs.ini
index e01b8d0..e6adec8 100644
--- a/language/en-GB/en-GB.plg_content_componentbuildersiteheaderstabs.ini
+++ b/language/en-GB/en-GB.plg_content_componentbuildersiteheaderstabs.ini
@@ -1,93 +1,93 @@
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS="Content - Componentbuilder Site Headers Tabs"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_DESCRIPTION="This plugin is used to set site class custom headers."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Site Headers Tabs (v.1.0.4)</h1> <div style='clear: both;'></div><p>This plugin is used to set site class custom headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 8th December, 2020</small></p>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_CLASS_HEADERS="Class Headers"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_MODEL_LABEL="Target Site View<br />Model Header"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_MODEL_DESCRIPTION="Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_YES="Yes"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_NO="No"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_MODEL_LABEL="Class Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS="Content - Componentbuilder Site Headers Tabs"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_DESCRIPTION="This plugin is used to set site class custom headers."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Site Headers Tabs (v.1.0.4)</h1> <div style='clear: both;'></div><p>This plugin is used to set site class custom headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 8th December, 2020</small></p>"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_CLASS_HEADERS="Class Headers"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_MODEL_LABEL="Target Site View<br />Model Header"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_MODEL_DESCRIPTION="Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_YES="Yes"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_NO="No"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_MODEL_LABEL="Class Header<br />
 <small>(site.view.model)</small><br />
 <b>getItem</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_MODEL_DESCRIPTION="The class header for site view model. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_MODEL_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_MODEL_DESCRIPTION="The class header for site view model. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_MODEL_LABEL="Power Header<br />
 <small>(site.view.model)</small><br />
 <b>getItem</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_MODEL_DESCRIPTION="The power header for site view model. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_HTML_LABEL="Target Site View<br />Class Header"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_HTML_DESCRIPTION="Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_HTML_LABEL="Class Header Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_MODEL_DESCRIPTION="The power header for site view model. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_HTML_LABEL="Target Site View<br />Class Header"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_HTML_DESCRIPTION="Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_HTML_LABEL="Class Header Header<br />
 <small>(site.view.html)</small><br />
 <b>getItem</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_HTML_DESCRIPTION="The class header header for site view. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_HTML_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_HTML_DESCRIPTION="The class header header for site view. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_HTML_LABEL="Power Header<br />
 <small>(site.view.html)</small><br />
 <b>getItem</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_HTML_DESCRIPTION="The power header for site view. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_LABEL="Target Site View<br />Default Template Header"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_DESCRIPTION="Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_LABEL="Default Template Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_HTML_DESCRIPTION="The power header for site view. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_LABEL="Target Site View<br />Default Template Header"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_DESCRIPTION="Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_LABEL="Default Template Header<br />
 <small>(site.view)</small><br />
 <b>getItem</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_DESCRIPTION="The default template header for site view. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_DESCRIPTION="The default template header for site view. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_LABEL="Power Header<br />
 <small>(site.view)</small><br />
 <b>getItem</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_DESCRIPTION="The power header for site view. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_CONTROLLER_LABEL="Target Site View<br />Controller Header"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_CONTROLLER_DESCRIPTION="Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>, and have custom code in the <b>PHP (controller methods)</b> under the Custom Buttons tab."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_CONTROLLER_LABEL="Class Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_DESCRIPTION="The power header for site view. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_CONTROLLER_LABEL="Target Site View<br />Controller Header"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_CONTROLLER_DESCRIPTION="Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>, and have custom code in the <b>PHP (controller methods)</b> under the Custom Buttons tab."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_CONTROLLER_LABEL="Class Header<br />
 <small>(site.view.controller)</small><br />
 <b>getItem</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_CONTROLLER_DESCRIPTION="The class header for site view controller. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>, and have custom code in the  <b>PHP (controller methods)</b> under the Custom Buttons tab."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_CONTROLLER_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_CONTROLLER_DESCRIPTION="The class header for site view controller. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>, and have custom code in the  <b>PHP (controller methods)</b> under the Custom Buttons tab."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_CONTROLLER_LABEL="Power Header<br />
 <small>(site.view.controller)</small><br />
 <b>getItem</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_CONTROLLER_DESCRIPTION="The power header for site view controller. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>, and have custom code in the  <b>PHP (controller methods)</b> under the Custom Buttons tab."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_MODEL_LABEL="Target Site Views<br />Model Header"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_MODEL_DESCRIPTION="Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_MODEL_LABEL="Class Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_CONTROLLER_DESCRIPTION="The power header for site view controller. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>, and have custom code in the  <b>PHP (controller methods)</b> under the Custom Buttons tab."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_MODEL_LABEL="Target Site Views<br />Model Header"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_MODEL_DESCRIPTION="Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_MODEL_LABEL="Class Header<br />
 <small>(site.views.model)</small><br />
 <b>getListQuery</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_MODEL_DESCRIPTION="The class header for site views model. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_MODEL_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_MODEL_DESCRIPTION="The class header for site views model. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_MODEL_LABEL="Power Header<br />
 <small>(site.views.model)</small><br />
 <b>getListQuery</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_MODEL_DESCRIPTION="The power header for site views model. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_HTML_LABEL="Target Site Views<br />Class Header"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_HTML_DESCRIPTION="Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_HTML_LABEL="Class Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_MODEL_DESCRIPTION="The power header for site views model. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_HTML_LABEL="Target Site Views<br />Class Header"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_HTML_DESCRIPTION="Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_HTML_LABEL="Class Header<br />
 <small>(site.views.html)</small><br />
 <b>getListQuery</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_HTML_DESCRIPTION="The class header for site views. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_HTML_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_HTML_DESCRIPTION="The class header for site views. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_HTML_LABEL="Power Header<br />
 <small>(site.views.html)</small><br />
 <b>getListQuery</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_HTML_DESCRIPTION="The power header for site views. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_LABEL="Target Site Views<br />Default Template Header"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_DESCRIPTION="Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_LABEL="Default Template Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_HTML_DESCRIPTION="The power header for site views. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_LABEL="Target Site Views<br />Default Template Header"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_DESCRIPTION="Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_LABEL="Default Template Header<br />
 <small>(site.views)</small><br />
 <b>getListQuery</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_DESCRIPTION="The default template header for site views. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_DESCRIPTION="The default template header for site views. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_LABEL="Power Header<br />
 <small>(site.views)</small><br />
 <b>getListQuery</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_DESCRIPTION="The power header for site views. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_CONTROLLER_LABEL="Target Site Views<br />Controller Header"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_CONTROLLER_DESCRIPTION="Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>, and have custom code in the  <b>PHP (controller methods)</b> under the Custom Buttons tab."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_CONTROLLER_LABEL="Class Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_DESCRIPTION="The power header for site views. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_CONTROLLER_LABEL="Target Site Views<br />Controller Header"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_CONTROLLER_DESCRIPTION="Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>, and have custom code in the  <b>PHP (controller methods)</b> under the Custom Buttons tab."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_CONTROLLER_LABEL="Class Header<br />
 <small>(site.views.controller)</small><br />
 <b>getListQuery</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_CONTROLLER_DESCRIPTION="The class header for site views controller. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>, and have custom code in the  <b>PHP (controller methods)</b> under the Custom Buttons tab."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_CONTROLLER_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_CONTROLLER_DESCRIPTION="The class header for site views controller. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>, and have custom code in the  <b>PHP (controller methods)</b> under the Custom Buttons tab."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_CONTROLLER_LABEL="Power Header<br />
 <small>(site.views.controller)</small><br />
 <b>getListQuery</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_CONTROLLER_DESCRIPTION="The power header for site views controller. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>, and have custom code in the  <b>PHP (controller methods)</b> under the Custom Buttons tab."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_AJAX_MODEL_LABEL="Target Ajax Model<br />Class Header"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_AJAX_MODEL_LABEL="Class Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_CONTROLLER_DESCRIPTION="The power header for site views controller. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>, and have custom code in the  <b>PHP (controller methods)</b> under the Custom Buttons tab."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_AJAX_MODEL_LABEL="Target Ajax Model<br />Class Header"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_AJAX_MODEL_LABEL="Class Header<br />
 <small>(ajax.model)</small>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_AJAX_MODEL_DESCRIPTION="The class header for Ajax model."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_AJAX_MODEL_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_AJAX_MODEL_DESCRIPTION="The class header for Ajax model."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_AJAX_MODEL_LABEL="Power Header<br />
 <small>(ajax.model)</small>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_AJAX_MODEL_DESCRIPTION="The power header for Ajax model."
\ No newline at end of file
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_AJAX_MODEL_DESCRIPTION="The power header for Ajax model."
\ No newline at end of file
diff --git a/language/en-GB/en-GB.plg_content_componentbuildersiteheaderstabs.sys.ini b/language/en-GB/en-GB.plg_content_componentbuildersiteheaderstabs.sys.ini
index e01b8d0..e6adec8 100644
--- a/language/en-GB/en-GB.plg_content_componentbuildersiteheaderstabs.sys.ini
+++ b/language/en-GB/en-GB.plg_content_componentbuildersiteheaderstabs.sys.ini
@@ -1,93 +1,93 @@
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS="Content - Componentbuilder Site Headers Tabs"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_DESCRIPTION="This plugin is used to set site class custom headers."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Site Headers Tabs (v.1.0.4)</h1> <div style='clear: both;'></div><p>This plugin is used to set site class custom headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 8th December, 2020</small></p>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_CLASS_HEADERS="Class Headers"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_MODEL_LABEL="Target Site View<br />Model Header"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_MODEL_DESCRIPTION="Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_YES="Yes"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_NO="No"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_MODEL_LABEL="Class Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS="Content - Componentbuilder Site Headers Tabs"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_DESCRIPTION="This plugin is used to set site class custom headers."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Site Headers Tabs (v.1.0.4)</h1> <div style='clear: both;'></div><p>This plugin is used to set site class custom headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 8th December, 2020</small></p>"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_CLASS_HEADERS="Class Headers"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_MODEL_LABEL="Target Site View<br />Model Header"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_MODEL_DESCRIPTION="Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_YES="Yes"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_NO="No"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_MODEL_LABEL="Class Header<br />
 <small>(site.view.model)</small><br />
 <b>getItem</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_MODEL_DESCRIPTION="The class header for site view model. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_MODEL_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_MODEL_DESCRIPTION="The class header for site view model. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_MODEL_LABEL="Power Header<br />
 <small>(site.view.model)</small><br />
 <b>getItem</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_MODEL_DESCRIPTION="The power header for site view model. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_HTML_LABEL="Target Site View<br />Class Header"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_HTML_DESCRIPTION="Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_HTML_LABEL="Class Header Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_MODEL_DESCRIPTION="The power header for site view model. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_HTML_LABEL="Target Site View<br />Class Header"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_HTML_DESCRIPTION="Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_HTML_LABEL="Class Header Header<br />
 <small>(site.view.html)</small><br />
 <b>getItem</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_HTML_DESCRIPTION="The class header header for site view. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_HTML_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_HTML_DESCRIPTION="The class header header for site view. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_HTML_LABEL="Power Header<br />
 <small>(site.view.html)</small><br />
 <b>getItem</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_HTML_DESCRIPTION="The power header for site view. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_LABEL="Target Site View<br />Default Template Header"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_DESCRIPTION="Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_LABEL="Default Template Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_HTML_DESCRIPTION="The power header for site view. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_LABEL="Target Site View<br />Default Template Header"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_DESCRIPTION="Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_LABEL="Default Template Header<br />
 <small>(site.view)</small><br />
 <b>getItem</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_DESCRIPTION="The default template header for site view. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_DESCRIPTION="The default template header for site view. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_LABEL="Power Header<br />
 <small>(site.view)</small><br />
 <b>getItem</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_DESCRIPTION="The power header for site view. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_CONTROLLER_LABEL="Target Site View<br />Controller Header"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_CONTROLLER_DESCRIPTION="Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>, and have custom code in the <b>PHP (controller methods)</b> under the Custom Buttons tab."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_CONTROLLER_LABEL="Class Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_DESCRIPTION="The power header for site view. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_CONTROLLER_LABEL="Target Site View<br />Controller Header"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEW_CONTROLLER_DESCRIPTION="Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>, and have custom code in the <b>PHP (controller methods)</b> under the Custom Buttons tab."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_CONTROLLER_LABEL="Class Header<br />
 <small>(site.view.controller)</small><br />
 <b>getItem</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_CONTROLLER_DESCRIPTION="The class header for site view controller. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>, and have custom code in the  <b>PHP (controller methods)</b> under the Custom Buttons tab."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_CONTROLLER_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEW_CONTROLLER_DESCRIPTION="The class header for site view controller. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>, and have custom code in the  <b>PHP (controller methods)</b> under the Custom Buttons tab."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_CONTROLLER_LABEL="Power Header<br />
 <small>(site.view.controller)</small><br />
 <b>getItem</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_CONTROLLER_DESCRIPTION="The power header for site view controller. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>, and have custom code in the  <b>PHP (controller methods)</b> under the Custom Buttons tab."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_MODEL_LABEL="Target Site Views<br />Model Header"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_MODEL_DESCRIPTION="Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_MODEL_LABEL="Class Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEW_CONTROLLER_DESCRIPTION="The power header for site view controller. Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>, and have custom code in the  <b>PHP (controller methods)</b> under the Custom Buttons tab."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_MODEL_LABEL="Target Site Views<br />Model Header"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_MODEL_DESCRIPTION="Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_MODEL_LABEL="Class Header<br />
 <small>(site.views.model)</small><br />
 <b>getListQuery</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_MODEL_DESCRIPTION="The class header for site views model. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_MODEL_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_MODEL_DESCRIPTION="The class header for site views model. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_MODEL_LABEL="Power Header<br />
 <small>(site.views.model)</small><br />
 <b>getListQuery</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_MODEL_DESCRIPTION="The power header for site views model. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_HTML_LABEL="Target Site Views<br />Class Header"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_HTML_DESCRIPTION="Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_HTML_LABEL="Class Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_MODEL_DESCRIPTION="The power header for site views model. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_HTML_LABEL="Target Site Views<br />Class Header"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_HTML_DESCRIPTION="Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_HTML_LABEL="Class Header<br />
 <small>(site.views.html)</small><br />
 <b>getListQuery</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_HTML_DESCRIPTION="The class header for site views. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_HTML_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_HTML_DESCRIPTION="The class header for site views. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_HTML_LABEL="Power Header<br />
 <small>(site.views.html)</small><br />
 <b>getListQuery</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_HTML_DESCRIPTION="The power header for site views. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_LABEL="Target Site Views<br />Default Template Header"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_DESCRIPTION="Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_LABEL="Default Template Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_HTML_DESCRIPTION="The power header for site views. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_LABEL="Target Site Views<br />Default Template Header"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_DESCRIPTION="Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_LABEL="Default Template Header<br />
 <small>(site.views)</small><br />
 <b>getListQuery</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_DESCRIPTION="The default template header for site views. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_DESCRIPTION="The default template header for site views. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_LABEL="Power Header<br />
 <small>(site.views)</small><br />
 <b>getListQuery</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_DESCRIPTION="The power header for site views. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_CONTROLLER_LABEL="Target Site Views<br />Controller Header"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_CONTROLLER_DESCRIPTION="Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>, and have custom code in the  <b>PHP (controller methods)</b> under the Custom Buttons tab."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_CONTROLLER_LABEL="Class Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_DESCRIPTION="The power header for site views. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_CONTROLLER_LABEL="Target Site Views<br />Controller Header"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_SITE_VIEWS_CONTROLLER_DESCRIPTION="Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>, and have custom code in the  <b>PHP (controller methods)</b> under the Custom Buttons tab."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_CONTROLLER_LABEL="Class Header<br />
 <small>(site.views.controller)</small><br />
 <b>getListQuery</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_CONTROLLER_DESCRIPTION="The class header for site views controller. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>, and have custom code in the  <b>PHP (controller methods)</b> under the Custom Buttons tab."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_CONTROLLER_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_SITE_VIEWS_CONTROLLER_DESCRIPTION="The class header for site views controller. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>, and have custom code in the  <b>PHP (controller methods)</b> under the Custom Buttons tab."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_CONTROLLER_LABEL="Power Header<br />
 <small>(site.views.controller)</small><br />
 <b>getListQuery</b>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_CONTROLLER_DESCRIPTION="The power header for site views controller. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>, and have custom code in the  <b>PHP (controller methods)</b> under the Custom Buttons tab."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_ADD_AJAX_MODEL_LABEL="Target Ajax Model<br />Class Header"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_AJAX_MODEL_LABEL="Class Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_SITE_VIEWS_CONTROLLER_DESCRIPTION="The power header for site views controller. Only use this option if you have a <b>getListQuery</b> as your <b>Main Get</b>, and have custom code in the  <b>PHP (controller methods)</b> under the Custom Buttons tab."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_ADD_AJAX_MODEL_LABEL="Target Ajax Model<br />Class Header"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_AJAX_MODEL_LABEL="Class Header<br />
 <small>(ajax.model)</small>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_AJAX_MODEL_DESCRIPTION="The class header for Ajax model."
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_AJAX_MODEL_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_AJAX_MODEL_DESCRIPTION="The class header for Ajax model."
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_AJAX_MODEL_LABEL="Power Header<br />
 <small>(ajax.model)</small>"
-PLG_CONTENTCOMPONENTBUILDERSITEHEADERSTABS_POWER_AJAX_MODEL_DESCRIPTION="The power header for Ajax model."
\ No newline at end of file
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_POWER_AJAX_MODEL_DESCRIPTION="The power header for Ajax model."
\ No newline at end of file