diff --git a/componentbuildercomponentdashboardheaderstabs.xml b/componentbuildercomponentdashboardheaderstabs.xml
index ead3d65..40505b0 100644
--- a/componentbuildercomponentdashboardheaderstabs.xml
+++ b/componentbuildercomponentdashboardheaderstabs.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="plugin" version="4" group="content" method="upgrade">
-	<name>PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS</name>
-	<creationDate>10th March, 2022</creationDate>
+	<name>PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS</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.1</version>
-	<description>PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_XML_DESCRIPTION</description>
+	<description>PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_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/component_dashboard.xml b/forms/component_dashboard.xml
index a3aac16..04a604d 100644
--- a/forms/component_dashboard.xml
+++ b/forms/component_dashboard.xml
@@ -3,7 +3,7 @@
 <form>
 	<fields name="params">
 	<!-- default paths of component_dashboard_headers fieldset points to the plugin -->
-	<fieldset name="component_dashboard_headers" label="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_CLASS_HEADERS"
+	<fieldset name="component_dashboard_headers" label="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_CLASS_HEADERS"
 		addrulepath="/plugins/content/componentbuildercomponentdashboardheaderstabs/rules"
 		addfieldpath="/plugins/content/componentbuildercomponentdashboardheaderstabs/fields"
 	>
@@ -12,22 +12,22 @@
 		<field
 			type="radio"
 			name="add_dashboard_view"
-			label="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_VIEW_LABEL"
+			label="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_VIEW_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
 			<!-- Option Set. -->
 			<option value="1">
-				PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_YES</option>
+				PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_YES</option>
 			<option value="0">
-				PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_NO</option>
+				PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_NO</option>
 		</field>
 		<!-- Dashboard_view Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
 			name="dashboard_view"
-			label="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_DESCRIPTION"
 			width="100%"
 			height="100px"
 			cols="15"
@@ -44,8 +44,8 @@
 		<field
 			type="powers"
 			name="power_dashboard_view"
-			label="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_DESCRIPTION"
 			class="list_class span12"
 			multiple="true"
 			default="0"
@@ -57,22 +57,22 @@
 		<field
 			type="radio"
 			name="add_dashboard_view_html"
-			label="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_VIEW_HTML_LABEL"
+			label="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_VIEW_HTML_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
 			<!-- Option Set. -->
 			<option value="1">
-				PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_YES</option>
+				PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_YES</option>
 			<option value="0">
-				PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_NO</option>
+				PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_NO</option>
 		</field>
 		<!-- Dashboard_view_html Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
 			name="dashboard_view_html"
-			label="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_HTML_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_HTML_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_HTML_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_HTML_DESCRIPTION"
 			width="100%"
 			height="100px"
 			cols="15"
@@ -89,8 +89,8 @@
 		<field
 			type="powers"
 			name="power_dashboard_view_html"
-			label="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_HTML_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_HTML_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_HTML_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_HTML_DESCRIPTION"
 			class="list_class span12"
 			multiple="true"
 			default="0"
@@ -102,22 +102,22 @@
 		<field
 			type="radio"
 			name="add_dashboard_model"
-			label="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_MODEL_LABEL"
+			label="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_MODEL_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
 			<!-- Option Set. -->
 			<option value="1">
-				PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_YES</option>
+				PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_YES</option>
 			<option value="0">
-				PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_NO</option>
+				PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_NO</option>
 		</field>
 		<!-- Dashboard_model Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
 			name="dashboard_model"
-			label="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_MODEL_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_MODEL_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_MODEL_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_MODEL_DESCRIPTION"
 			width="100%"
 			height="100px"
 			cols="15"
@@ -134,8 +134,8 @@
 		<field
 			type="powers"
 			name="power_dashboard_model"
-			label="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_MODEL_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_MODEL_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_MODEL_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_MODEL_DESCRIPTION"
 			class="list_class span12"
 			multiple="true"
 			default="0"
@@ -147,22 +147,22 @@
 		<field
 			type="radio"
 			name="add_dashboard_controller"
-			label="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_CONTROLLER_LABEL"
+			label="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_CONTROLLER_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
 			<!-- Option Set. -->
 			<option value="1">
-				PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_YES</option>
+				PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_YES</option>
 			<option value="0">
-				PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_NO</option>
+				PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_NO</option>
 		</field>
 		<!-- Dashboard_controller Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
 			name="dashboard_controller"
-			label="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_CONTROLLER_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_CONTROLLER_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_CONTROLLER_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_CONTROLLER_DESCRIPTION"
 			width="100%"
 			height="100px"
 			cols="15"
@@ -179,8 +179,8 @@
 		<field
 			type="powers"
 			name="power_dashboard_controller"
-			label="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_CONTROLLER_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_CONTROLLER_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_CONTROLLER_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_CONTROLLER_DESCRIPTION"
 			class="list_class span12"
 			multiple="true"
 			default="0"
@@ -192,22 +192,22 @@
 		<field
 			type="radio"
 			name="add_ajax_model"
-			label="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_AJAX_MODEL_LABEL"
+			label="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_AJAX_MODEL_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
 			<!-- Option Set. -->
 			<option value="1">
-				PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_YES</option>
+				PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_YES</option>
 			<option value="0">
-				PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_NO</option>
+				PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_NO</option>
 		</field>
 		<!-- Ajax_model Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
 			name="ajax_model"
-			label="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_AJAX_MODEL_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_AJAX_MODEL_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_AJAX_MODEL_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_AJAX_MODEL_DESCRIPTION"
 			width="100%"
 			height="100px"
 			cols="15"
@@ -224,8 +224,8 @@
 		<field
 			type="powers"
 			name="power_ajax_model"
-			label="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_AJAX_MODEL_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_AJAX_MODEL_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_AJAX_MODEL_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_AJAX_MODEL_DESCRIPTION"
 			class="list_class span12"
 			multiple="true"
 			default="0"
diff --git a/language/en-GB/en-GB.plg_content_componentbuildercomponentdashboardheaderstabs.ini b/language/en-GB/en-GB.plg_content_componentbuildercomponentdashboardheaderstabs.ini
index 786ca2c..ffb36b5 100644
--- a/language/en-GB/en-GB.plg_content_componentbuildercomponentdashboardheaderstabs.ini
+++ b/language/en-GB/en-GB.plg_content_componentbuildercomponentdashboardheaderstabs.ini
@@ -1,41 +1,41 @@
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS="Content - Componentbuilder Component Dashboard Headers Tabs"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DESCRIPTION="This plugin is used to set component dashboard class custom headers."
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Component Dashboard Headers Tabs (v.1.0.1)</h1> <div style='clear: both;'></div><p>This plugin is used to set component dashboard class custom headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 6th December, 2021</small></p>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_CLASS_HEADERS="Class Headers"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_VIEW_LABEL="Target Dashboard View<br />Default Template Header"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_YES="Yes"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_NO="No"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_LABEL="View Header<br />
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS="Content - Componentbuilder Component Dashboard Headers Tabs"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DESCRIPTION="This plugin is used to set component dashboard class custom headers."
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Component Dashboard Headers Tabs (v.1.0.1)</h1> <div style='clear: both;'></div><p>This plugin is used to set component dashboard class custom headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 6th December, 2021</small></p>"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_CLASS_HEADERS="Class Headers"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_VIEW_LABEL="Target Dashboard View<br />Default Template Header"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_YES="Yes"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_NO="No"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_LABEL="View Header<br />
 <small>(dashboard.view)</small>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_DESCRIPTION="The file header for dashboard view."
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_DESCRIPTION="The file header for dashboard view."
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_LABEL="Power Header<br />
 <small>(dashboard.view)</small>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_DESCRIPTION="The power header for dashboard view."
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_VIEW_HTML_LABEL="Target Dashboard View<br />Class Header"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_HTML_LABEL="Class Header<br />
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_DESCRIPTION="The power header for dashboard view."
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_VIEW_HTML_LABEL="Target Dashboard View<br />Class Header"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_HTML_LABEL="Class Header<br />
 <small>(dashboard.view.html)</small>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_HTML_DESCRIPTION="The class header for dashboard view."
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_HTML_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_HTML_DESCRIPTION="The class header for dashboard view."
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_HTML_LABEL="Power Header<br />
 <small>(dashboard.view.html)</small>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_HTML_DESCRIPTION="The power header for dashboard view class."
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_MODEL_LABEL="Target Dashboard Model<br />Class Header"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_MODEL_LABEL="Class Header<br />
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_HTML_DESCRIPTION="The power header for dashboard view class."
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_MODEL_LABEL="Target Dashboard Model<br />Class Header"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_MODEL_LABEL="Class Header<br />
 <small>(dashboard.model)</small>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_MODEL_DESCRIPTION="The class header for dashboard model."
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_MODEL_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_MODEL_DESCRIPTION="The class header for dashboard model."
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_MODEL_LABEL="Power Header<br />
 <small>(dashboard.model)</small>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_MODEL_DESCRIPTION="The power header for dashboard model class."
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_CONTROLLER_LABEL="Target Dashboard Cotroller<br />Class Header"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_CONTROLLER_LABEL="Class Header<br />
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_MODEL_DESCRIPTION="The power header for dashboard model class."
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_CONTROLLER_LABEL="Target Dashboard Cotroller<br />Class Header"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_CONTROLLER_LABEL="Class Header<br />
 <small>(dashboard.controller)</small>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_CONTROLLER_DESCRIPTION="The class header for dashboard controller."
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_CONTROLLER_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_CONTROLLER_DESCRIPTION="The class header for dashboard controller."
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_CONTROLLER_LABEL="Power Header<br />
 <small>(dashboard.controller)</small>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_CONTROLLER_DESCRIPTION="The power header for dashboard controller class."
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_AJAX_MODEL_LABEL="Target Ajax Model<br />Class Header"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_AJAX_MODEL_LABEL="Class Header<br />
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_CONTROLLER_DESCRIPTION="The power header for dashboard controller class."
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_AJAX_MODEL_LABEL="Target Ajax Model<br />Class Header"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_AJAX_MODEL_LABEL="Class Header<br />
 <small>(ajax.model)</small>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_AJAX_MODEL_DESCRIPTION="The class header for Ajax model."
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_AJAX_MODEL_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_AJAX_MODEL_DESCRIPTION="The class header for Ajax model."
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_AJAX_MODEL_LABEL="Power Header<br />
 <small>(ajax.model)</small>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_AJAX_MODEL_DESCRIPTION="The power header for Ajax model."
\ No newline at end of file
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_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_componentbuildercomponentdashboardheaderstabs.sys.ini b/language/en-GB/en-GB.plg_content_componentbuildercomponentdashboardheaderstabs.sys.ini
index 786ca2c..ffb36b5 100644
--- a/language/en-GB/en-GB.plg_content_componentbuildercomponentdashboardheaderstabs.sys.ini
+++ b/language/en-GB/en-GB.plg_content_componentbuildercomponentdashboardheaderstabs.sys.ini
@@ -1,41 +1,41 @@
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS="Content - Componentbuilder Component Dashboard Headers Tabs"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DESCRIPTION="This plugin is used to set component dashboard class custom headers."
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Component Dashboard Headers Tabs (v.1.0.1)</h1> <div style='clear: both;'></div><p>This plugin is used to set component dashboard class custom headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 6th December, 2021</small></p>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_CLASS_HEADERS="Class Headers"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_VIEW_LABEL="Target Dashboard View<br />Default Template Header"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_YES="Yes"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_NO="No"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_LABEL="View Header<br />
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS="Content - Componentbuilder Component Dashboard Headers Tabs"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DESCRIPTION="This plugin is used to set component dashboard class custom headers."
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Component Dashboard Headers Tabs (v.1.0.1)</h1> <div style='clear: both;'></div><p>This plugin is used to set component dashboard class custom headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 6th December, 2021</small></p>"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_CLASS_HEADERS="Class Headers"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_VIEW_LABEL="Target Dashboard View<br />Default Template Header"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_YES="Yes"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_NO="No"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_LABEL="View Header<br />
 <small>(dashboard.view)</small>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_DESCRIPTION="The file header for dashboard view."
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_DESCRIPTION="The file header for dashboard view."
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_LABEL="Power Header<br />
 <small>(dashboard.view)</small>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_DESCRIPTION="The power header for dashboard view."
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_VIEW_HTML_LABEL="Target Dashboard View<br />Class Header"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_HTML_LABEL="Class Header<br />
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_DESCRIPTION="The power header for dashboard view."
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_VIEW_HTML_LABEL="Target Dashboard View<br />Class Header"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_HTML_LABEL="Class Header<br />
 <small>(dashboard.view.html)</small>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_HTML_DESCRIPTION="The class header for dashboard view."
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_HTML_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_VIEW_HTML_DESCRIPTION="The class header for dashboard view."
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_HTML_LABEL="Power Header<br />
 <small>(dashboard.view.html)</small>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_HTML_DESCRIPTION="The power header for dashboard view class."
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_MODEL_LABEL="Target Dashboard Model<br />Class Header"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_MODEL_LABEL="Class Header<br />
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_VIEW_HTML_DESCRIPTION="The power header for dashboard view class."
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_MODEL_LABEL="Target Dashboard Model<br />Class Header"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_MODEL_LABEL="Class Header<br />
 <small>(dashboard.model)</small>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_MODEL_DESCRIPTION="The class header for dashboard model."
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_MODEL_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_MODEL_DESCRIPTION="The class header for dashboard model."
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_MODEL_LABEL="Power Header<br />
 <small>(dashboard.model)</small>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_MODEL_DESCRIPTION="The power header for dashboard model class."
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_CONTROLLER_LABEL="Target Dashboard Cotroller<br />Class Header"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_CONTROLLER_LABEL="Class Header<br />
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_MODEL_DESCRIPTION="The power header for dashboard model class."
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_DASHBOARD_CONTROLLER_LABEL="Target Dashboard Cotroller<br />Class Header"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_CONTROLLER_LABEL="Class Header<br />
 <small>(dashboard.controller)</small>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_CONTROLLER_DESCRIPTION="The class header for dashboard controller."
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_CONTROLLER_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_DASHBOARD_CONTROLLER_DESCRIPTION="The class header for dashboard controller."
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_CONTROLLER_LABEL="Power Header<br />
 <small>(dashboard.controller)</small>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_CONTROLLER_DESCRIPTION="The power header for dashboard controller class."
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_AJAX_MODEL_LABEL="Target Ajax Model<br />Class Header"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_AJAX_MODEL_LABEL="Class Header<br />
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_DASHBOARD_CONTROLLER_DESCRIPTION="The power header for dashboard controller class."
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_ADD_AJAX_MODEL_LABEL="Target Ajax Model<br />Class Header"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_AJAX_MODEL_LABEL="Class Header<br />
 <small>(ajax.model)</small>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_AJAX_MODEL_DESCRIPTION="The class header for Ajax model."
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_AJAX_MODEL_LABEL="Power Header<br />
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_AJAX_MODEL_DESCRIPTION="The class header for Ajax model."
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_AJAX_MODEL_LABEL="Power Header<br />
 <small>(ajax.model)</small>"
-PLG_CONTENTCOMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_AJAX_MODEL_DESCRIPTION="The power header for Ajax model."
\ No newline at end of file
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_POWER_AJAX_MODEL_DESCRIPTION="The power header for Ajax model."
\ No newline at end of file