diff --git a/componentbuilderpowersautoloadercompiler.php b/componentbuilderpowersautoloadercompiler.php
index 6804021..6a9af9d 100644
--- a/componentbuilderpowersautoloadercompiler.php
+++ b/componentbuilderpowersautoloadercompiler.php
@@ -56,7 +56,7 @@ class PlgExtensionComponentbuilderPowersAutoloaderCompiler extends CMSPlugin
 			}
 			else
 			{
-				JFactory::getApplication()->enqueueMessage(JText::_('PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_YOU_DO_NOT_HAVE_A_GLOBAL_POWER_PLUGIN_SETUP_SO_THE_POWERS_PLUGIN_AUTOLOADER_COULD_NOT_BE_ADDED'), 'Error');
+				JFactory::getApplication()->enqueueMessage(JText::_('PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_YOU_DO_NOT_HAVE_A_GLOBAL_POWER_PLUGIN_SETUP_SO_THE_POWERS_PLUGIN_AUTOLOADER_COULD_NOT_BE_ADDED'), 'Error');
 			}
 		}
 	}
diff --git a/componentbuilderpowersautoloadercompiler.xml b/componentbuilderpowersautoloadercompiler.xml
index 38f910b..a5dffd3 100644
--- a/componentbuilderpowersautoloadercompiler.xml
+++ b/componentbuilderpowersautoloadercompiler.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="plugin" version="4" group="extension" method="upgrade">
-	<name>PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER</name>
-	<creationDate>15th January, 2022</creationDate>
+	<name>PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER</name>
+	<creationDate>10th March, 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_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_XML_DESCRIPTION</description>
+	<description>PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_XML_DESCRIPTION</description>
 
 	<!-- Scripts to run on installation -->
 	<scriptfile>script.php</scriptfile>
@@ -32,17 +32,17 @@
 	<config>
 	<fields name="params">
 	<!-- default paths of basic fieldset points to the plugin -->
-	<fieldset name="basic" label="PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_GLOBAL_AUTOLOADER"
+	<fieldset name="basic" label="PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_GLOBAL_AUTOLOADER"
 		addrulepath="/plugins/extension/componentbuilderpowersautoloadercompiler/rules"
 		addfieldpath="/plugins/extension/componentbuilderpowersautoloadercompiler/fields"
 	>
 		<!-- Note_select_power_plugin Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_select_power_plugin" label="PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_NOTE_SELECT_POWER_PLUGIN_LABEL" description="PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_NOTE_SELECT_POWER_PLUGIN_DESCRIPTION" heading="h4" class="alert alert-info note_select_power_plugin" />
+		<field type="note" name="note_select_power_plugin" label="PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_NOTE_SELECT_POWER_PLUGIN_LABEL" description="PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_NOTE_SELECT_POWER_PLUGIN_DESCRIPTION" heading="h4" class="alert alert-info note_select_power_plugin" />
 		<!-- Plugin Field. Type: Joomlaplugins. (custom) -->
 		<field
 			type="joomlaplugins"
 			name="plugin"
-			label="PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_PLUGIN_LABEL"
+			label="PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_PLUGIN_LABEL"
 			class="list_class span12"
 			multiple="false"
 			default="0"
@@ -52,23 +52,23 @@
 		<field
 			type="radio"
 			name="activate_option"
-			label="PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_ACTIVATE_OPTION_LABEL"
-			description="PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_ACTIVATE_OPTION_DESCRIPTION"
+			label="PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_ACTIVATE_OPTION_LABEL"
+			description="PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_ACTIVATE_OPTION_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="1"
 			required="true">
 			<!-- Option Set. -->
 			<option value="1">
-				PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_ALL</option>
+				PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_ALL</option>
 			<option value="2">
-				PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_SELECTED</option>
+				PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_SELECTED</option>
 		</field>
 		<!-- Components Field. Type: Joomlacomponents. (custom) -->
 		<field
 			type="joomlacomponents"
 			name="components"
-			label="PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_COMPONENTS_LABEL"
-			description="PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_COMPONENTS_DESCRIPTION"
+			label="PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_COMPONENTS_LABEL"
+			description="PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_COMPONENTS_DESCRIPTION"
 			class="list_class"
 			multiple="true"
 			default="0"
diff --git a/fields/joomlaplugins.php b/fields/joomlaplugins.php
index 7120198..103b6f9 100644
--- a/fields/joomlaplugins.php
+++ b/fields/joomlaplugins.php
@@ -82,7 +82,7 @@ class JFormFieldJoomlaplugins extends JFormFieldList
 			if ($user->authorise('joomla_plugin.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_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_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_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_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=joomla_plugin&amp;layout=edit'.$ref.'" >
 					<span class="icon-new icon-white"></span></a>';
 			}
@@ -90,7 +90,7 @@ class JFormFieldJoomlaplugins extends JFormFieldList
 			if ($user->authorise('joomla_plugin.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_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_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_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_EDIT_S', $button_label).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
 					<span class="icon-edit"></span></a>';
 				// build script
 				$script[] = "
diff --git a/language/en-GB/en-GB.plg_extension_componentbuilderpowersautoloadercompiler.ini b/language/en-GB/en-GB.plg_extension_componentbuilderpowersautoloadercompiler.ini
index 45a4151..a72c5de 100644
--- a/language/en-GB/en-GB.plg_extension_componentbuilderpowersautoloadercompiler.ini
+++ b/language/en-GB/en-GB.plg_extension_componentbuilderpowersautoloadercompiler.ini
@@ -1,14 +1,14 @@
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER="Extension - Componentbuilder Powers Autoloader Compiler"
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_DESCRIPTION="This plugin is used to build the power autoloader plugin for your component during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field."
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_XML_DESCRIPTION="<h1>Extension - Componentbuilder Powers Autoloader Compiler (v.1.0.1)</h1> <div style='clear: both;'></div><p>This plugin is used to build the power autoloader plugin for your component during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 13th November, 2021</small></p>"
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_YOU_DO_NOT_HAVE_A_GLOBAL_POWER_PLUGIN_SETUP_SO_THE_POWERS_PLUGIN_AUTOLOADER_COULD_NOT_BE_ADDED="You do not have a global power plugin setup, so the powers plugin autoloader could not be added."
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_GLOBAL_AUTOLOADER="Global Autoloader"
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_NOTE_SELECT_POWER_PLUGIN_LABEL="Select your power autoloader plugin here."
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_NOTE_SELECT_POWER_PLUGIN_DESCRIPTION="If you don't yet have a global powers autoloader plugin, <a href='#' target='_blank'>watch this tutorial</a> to see how to setup it up."
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_PLUGIN_LABEL="Plugins"
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_ACTIVATE_OPTION_LABEL="Activate Options"
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_ACTIVATE_OPTION_DESCRIPTION="You can select the kind of activation control you would like to use. <b>All</b> will target all components, and <b>Selected</b> will let you select only those you want to be active."
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_ALL="All"
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_SELECTED="Selected"
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_COMPONENTS_LABEL="Components"
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_COMPONENTS_DESCRIPTION="Select the components you would like to be targeted."
\ No newline at end of file
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER="Extension - Componentbuilder Powers Autoloader Compiler"
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_DESCRIPTION="This plugin is used to build the power autoloader plugin for your component during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field."
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_XML_DESCRIPTION="<h1>Extension - Componentbuilder Powers Autoloader Compiler (v.1.0.1)</h1> <div style='clear: both;'></div><p>This plugin is used to build the power autoloader plugin for your component during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 13th November, 2021</small></p>"
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_YOU_DO_NOT_HAVE_A_GLOBAL_POWER_PLUGIN_SETUP_SO_THE_POWERS_PLUGIN_AUTOLOADER_COULD_NOT_BE_ADDED="You do not have a global power plugin setup, so the powers plugin autoloader could not be added."
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_GLOBAL_AUTOLOADER="Global Autoloader"
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_NOTE_SELECT_POWER_PLUGIN_LABEL="Select your power autoloader plugin here."
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_NOTE_SELECT_POWER_PLUGIN_DESCRIPTION="If you don't yet have a global powers autoloader plugin, <a href='#' target='_blank'>watch this tutorial</a> to see how to setup it up."
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_PLUGIN_LABEL="Plugins"
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_ACTIVATE_OPTION_LABEL="Activate Options"
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_ACTIVATE_OPTION_DESCRIPTION="You can select the kind of activation control you would like to use. <b>All</b> will target all components, and <b>Selected</b> will let you select only those you want to be active."
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_ALL="All"
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_SELECTED="Selected"
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_COMPONENTS_LABEL="Components"
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_COMPONENTS_DESCRIPTION="Select the components you would like to be targeted."
\ No newline at end of file
diff --git a/language/en-GB/en-GB.plg_extension_componentbuilderpowersautoloadercompiler.sys.ini b/language/en-GB/en-GB.plg_extension_componentbuilderpowersautoloadercompiler.sys.ini
index 45a4151..a72c5de 100644
--- a/language/en-GB/en-GB.plg_extension_componentbuilderpowersautoloadercompiler.sys.ini
+++ b/language/en-GB/en-GB.plg_extension_componentbuilderpowersautoloadercompiler.sys.ini
@@ -1,14 +1,14 @@
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER="Extension - Componentbuilder Powers Autoloader Compiler"
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_DESCRIPTION="This plugin is used to build the power autoloader plugin for your component during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field."
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_XML_DESCRIPTION="<h1>Extension - Componentbuilder Powers Autoloader Compiler (v.1.0.1)</h1> <div style='clear: both;'></div><p>This plugin is used to build the power autoloader plugin for your component during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 13th November, 2021</small></p>"
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_YOU_DO_NOT_HAVE_A_GLOBAL_POWER_PLUGIN_SETUP_SO_THE_POWERS_PLUGIN_AUTOLOADER_COULD_NOT_BE_ADDED="You do not have a global power plugin setup, so the powers plugin autoloader could not be added."
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_GLOBAL_AUTOLOADER="Global Autoloader"
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_NOTE_SELECT_POWER_PLUGIN_LABEL="Select your power autoloader plugin here."
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_NOTE_SELECT_POWER_PLUGIN_DESCRIPTION="If you don't yet have a global powers autoloader plugin, <a href='#' target='_blank'>watch this tutorial</a> to see how to setup it up."
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_PLUGIN_LABEL="Plugins"
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_ACTIVATE_OPTION_LABEL="Activate Options"
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_ACTIVATE_OPTION_DESCRIPTION="You can select the kind of activation control you would like to use. <b>All</b> will target all components, and <b>Selected</b> will let you select only those you want to be active."
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_ALL="All"
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_SELECTED="Selected"
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_COMPONENTS_LABEL="Components"
-PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_COMPONENTS_DESCRIPTION="Select the components you would like to be targeted."
\ No newline at end of file
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER="Extension - Componentbuilder Powers Autoloader Compiler"
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_DESCRIPTION="This plugin is used to build the power autoloader plugin for your component during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field."
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_XML_DESCRIPTION="<h1>Extension - Componentbuilder Powers Autoloader Compiler (v.1.0.1)</h1> <div style='clear: both;'></div><p>This plugin is used to build the power autoloader plugin for your component during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 13th November, 2021</small></p>"
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_YOU_DO_NOT_HAVE_A_GLOBAL_POWER_PLUGIN_SETUP_SO_THE_POWERS_PLUGIN_AUTOLOADER_COULD_NOT_BE_ADDED="You do not have a global power plugin setup, so the powers plugin autoloader could not be added."
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_GLOBAL_AUTOLOADER="Global Autoloader"
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_NOTE_SELECT_POWER_PLUGIN_LABEL="Select your power autoloader plugin here."
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_NOTE_SELECT_POWER_PLUGIN_DESCRIPTION="If you don't yet have a global powers autoloader plugin, <a href='#' target='_blank'>watch this tutorial</a> to see how to setup it up."
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_PLUGIN_LABEL="Plugins"
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_ACTIVATE_OPTION_LABEL="Activate Options"
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_ACTIVATE_OPTION_DESCRIPTION="You can select the kind of activation control you would like to use. <b>All</b> will target all components, and <b>Selected</b> will let you select only those you want to be active."
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_ALL="All"
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_SELECTED="Selected"
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_COMPONENTS_LABEL="Components"
+PLG_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_COMPONENTS_DESCRIPTION="Select the components you would like to be targeted."
\ No newline at end of file