diff --git a/componentbuilderprivacytabs.xml b/componentbuilderprivacytabs.xml
index 2385fe2..7ab242b 100644
--- a/componentbuilderprivacytabs.xml
+++ b/componentbuilderprivacytabs.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="plugin" version="4" group="content" method="upgrade">
-	<name>PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS</name>
-	<creationDate>10th March, 2022</creationDate>
+	<name>PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS</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.0</version>
-	<description>PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_XML_DESCRIPTION</description>
+	<description>PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_XML_DESCRIPTION</description>
 
 	<!-- Scripts to run on installation -->
 	<scriptfile>script.php</scriptfile>
@@ -33,17 +33,17 @@
 	<config>
 	<fields name="params">
 	<!-- default paths of basic fieldset points to the plugin -->
-	<fieldset name="basic" label="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_GLOBAL_PRIVACY"
+	<fieldset name="basic" label="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_GLOBAL_PRIVACY"
 		addrulepath="/plugins/content/componentbuilderprivacytabs/rules"
 		addfieldpath="/plugins/content/componentbuilderprivacytabs/fields"
 	>
 		<!-- Note_select_privacy_plugin Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_select_privacy_plugin" label="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_SELECT_PRIVACY_PLUGIN_LABEL" description="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_SELECT_PRIVACY_PLUGIN_DESCRIPTION" heading="h4" class="alert alert-info note_select_privacy_plugin" />
+		<field type="note" name="note_select_privacy_plugin" label="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_SELECT_PRIVACY_PLUGIN_LABEL" description="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_SELECT_PRIVACY_PLUGIN_DESCRIPTION" heading="h4" class="alert alert-info note_select_privacy_plugin" />
 		<!-- Plugin Field. Type: Joomlaplugins. (custom) -->
 		<field
 			type="joomlaplugins"
 			name="plugin"
-			label="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_PLUGIN_LABEL"
+			label="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_PLUGIN_LABEL"
 			class="list_class span12"
 			multiple="false"
 			default="0"
diff --git a/fields/joomlaplugins.php b/fields/joomlaplugins.php
index 103b6f9..7120198 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_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_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_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_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_EXTENSIONCOMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_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_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_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/forms/admin_view.xml b/forms/admin_view.xml
index d0f340c..8305c88 100644
--- a/forms/admin_view.xml
+++ b/forms/admin_view.xml
@@ -3,69 +3,69 @@
 <form>
 	<fields name="params">
 	<!-- default paths of privacy fieldset points to the plugin -->
-	<fieldset name="privacy" label="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_PRIVACY"
+	<fieldset name="privacy" label="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_PRIVACY"
 		addrulepath="/plugins/content/componentbuilderprivacytabs/rules"
 		addfieldpath="/plugins/content/componentbuilderprivacytabs/fields"
 	>
 	<fields name="privacy">
 		<!-- Note_plugin_actions Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_plugin_actions" label="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ACTIONS_LABEL" description="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ACTIONS_DESCRIPTION" heading="h3" class="alert alert-info note_plugin_actions" />
+		<field type="note" name="note_plugin_actions" label="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ACTIONS_LABEL" description="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ACTIONS_DESCRIPTION" heading="h3" class="alert alert-info note_plugin_actions" />
 		<!-- Activate Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
 			name="activate"
-			label="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_ACTIVATE_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_ACTIVATE_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_ACTIVATE_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_ACTIVATE_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
 			<!-- Option Set. -->
 			<option value="1">
-				PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_YES</option>
+				PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_YES</option>
 			<option value="0">
-				PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NO</option>
+				PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NO</option>
 		</field>
 		<!-- Note_plugin_permission Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_plugin_permission" label="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_PERMISSION_LABEL" description="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_PERMISSION_DESCRIPTION" heading="h4" class="alert alert-info note_plugin_permission" showon="activate:1" />
+		<field type="note" name="note_plugin_permission" label="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_PERMISSION_LABEL" description="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_PERMISSION_DESCRIPTION" heading="h4" class="alert alert-info note_plugin_permission" showon="activate:1" />
 		<!-- Permissions Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
 			name="permissions"
-			label="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_PERMISSIONS_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_PERMISSIONS_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_PERMISSIONS_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_PERMISSIONS_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="1"
 			required="true"
 			showon="activate:1">
 			<!-- Option Set. -->
 			<option value="1">
-				PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_YES</option>
+				PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_YES</option>
 			<option value="0">
-				PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NO</option>
+				PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NO</option>
 		</field>
 		<!-- Note_plugin_anonymize Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_plugin_anonymize" label="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ANONYMIZE_LABEL" description="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ANONYMIZE_DESCRIPTION" heading="h4" class="alert alert-info note_plugin_anonymize" showon="activate:1" />
+		<field type="note" name="note_plugin_anonymize" label="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ANONYMIZE_LABEL" description="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ANONYMIZE_DESCRIPTION" heading="h4" class="alert alert-info note_plugin_anonymize" showon="activate:1" />
 		<!-- Anonymize Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
 			name="anonymize"
-			label="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_ANONYMIZE_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_ANONYMIZE_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_ANONYMIZE_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_ANONYMIZE_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true"
 			showon="activate:1">
 			<!-- Option Set. -->
 			<option value="1">
-				PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_YES</option>
+				PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_YES</option>
 			<option value="0">
-				PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NO</option>
+				PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NO</option>
 		</field>
 		<!-- Anonymize_fields Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
 			name="anonymize_fields"
-			label="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_ANONYMIZE_FIELDS_LABEL"
+			label="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_ANONYMIZE_FIELDS_LABEL"
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			buttons="add,remove,move"
@@ -77,17 +77,17 @@
 				<field
 					type="targetfields"
 					name="field"
-					label="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_FIELD_LABEL"
+					label="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_FIELD_LABEL"
 					button="false"
 				/>
 				<!-- Value Field. Type: Text. (joomla) -->
 				<field
 					type="text"
 					name="value"
-					label="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_VALUE_LABEL"
+					label="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_VALUE_LABEL"
 					size="10"
 					maxlength="50"
-					description="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_VALUE_DESCRIPTION"
+					description="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_VALUE_DESCRIPTION"
 					class="text_area"
 					filter="STRING"
 					autocomplete="on"
@@ -95,32 +95,32 @@
 			</form>
 		</field>
 		<!-- Note_plugin_user_link Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_plugin_user_link" label="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_USER_LINK_LABEL" description="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_USER_LINK_DESCRIPTION" heading="h4" class="alert alert-info note_plugin_user_link" showon="activate:1" />
+		<field type="note" name="note_plugin_user_link" label="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_USER_LINK_LABEL" description="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_USER_LINK_DESCRIPTION" heading="h4" class="alert alert-info note_plugin_user_link" showon="activate:1" />
 		<!-- User_link Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
 			name="user_link"
-			label="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_USER_LINK_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_USER_LINK_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_USER_LINK_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_USER_LINK_DESCRIPTION"
 			class="btn-group btn-group-yesno"
 			default="1"
 			required="true"
 			showon="activate:1">
 			<!-- Option Set. -->
 			<option value="1">
-				PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_CREATED_BY</option>
+				PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_CREATED_BY</option>
 			<option value="2">
-				PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_OTHER_USER_FIELD</option>
+				PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_OTHER_USER_FIELD</option>
 			<option value="3">
-				PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_CUSTOM</option>
+				PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_CUSTOM</option>
 		</field>
 		<!-- Custom_link Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
 			name="custom_link"
-			label="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_CUSTOM_LINK_LABEL"
+			label="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_CUSTOM_LINK_LABEL"
 			default="$query->where($db->quoteName('created_by') . ' = ' . $db->quote($user->id));"
-			description="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_CUSTOM_LINK_DESCRIPTION"
+			description="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_CUSTOM_LINK_DESCRIPTION"
 			width="100%"
 			height="80px"
 			cols="15"
@@ -136,8 +136,8 @@
 		<field
 			type="targetfields"
 			name="other_user_field"
-			label="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_OTHER_USER_FIELD_LABEL"
-			description="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_OTHER_USER_FIELD_DESCRIPTION"
+			label="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_OTHER_USER_FIELD_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_OTHER_USER_FIELD_DESCRIPTION"
 			showon="activate:1[AND]user_link:2"
 		/>
 	</fields>
diff --git a/forms/config.xml b/forms/config.xml
index 13a6f80..c523c02 100644
--- a/forms/config.xml
+++ b/forms/config.xml
@@ -3,17 +3,17 @@
 <form>
 	<fields name="params">
 	<!-- default paths of plugin fieldset points to the plugin -->
-	<fieldset name="plugin" label="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_PLUGIN"
+	<fieldset name="plugin" label="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_PLUGIN"
 		addrulepath="/plugins/content/componentbuilderprivacytabs/rules"
 		addfieldpath="/plugins/content/componentbuilderprivacytabs/fields"
 	>
 		<!-- Note_select_privacy_plugin Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_select_privacy_plugin" label="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_SELECT_PRIVACY_PLUGIN_LABEL" description="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_SELECT_PRIVACY_PLUGIN_DESCRIPTION" heading="h4" class="alert alert-info note_select_privacy_plugin" />
+		<field type="note" name="note_select_privacy_plugin" label="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_SELECT_PRIVACY_PLUGIN_LABEL" description="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_SELECT_PRIVACY_PLUGIN_DESCRIPTION" heading="h4" class="alert alert-info note_select_privacy_plugin" />
 		<!-- Plugin Field. Type: Joomlaplugins. (custom) -->
 		<field
 			type="joomlaplugins"
 			name="plugin"
-			label="PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_PLUGIN_LABEL"
+			label="PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_PLUGIN_LABEL"
 			class="list_class span12"
 			multiple="false"
 			default="0"
diff --git a/language/en-GB/en-GB.plg_content_componentbuilderprivacytabs.ini b/language/en-GB/en-GB.plg_content_componentbuilderprivacytabs.ini
index c773804..b927a54 100644
--- a/language/en-GB/en-GB.plg_content_componentbuilderprivacytabs.ini
+++ b/language/en-GB/en-GB.plg_content_componentbuilderprivacytabs.ini
@@ -1,39 +1,39 @@
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS="Content - Componentbuilder Privacy Tabs"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_DESCRIPTION="This plugin is used to link your components to the privacy suite of Joomla by adding a new privacy tab to the JCB admin views, where you can set all the required details for the integration."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Privacy Tabs (v.1.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to link your components to the privacy suite of Joomla by adding a new privacy tab to the JCB admin views, where you can set all the required details for the integration.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 17th August, 2019</small></p>"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_GLOBAL_PRIVACY="Global Privacy"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_PLUGIN="Plugin"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_PRIVACY="Privacy"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_SELECT_PRIVACY_PLUGIN_LABEL="Select your global privacy plugin here."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_SELECT_PRIVACY_PLUGIN_DESCRIPTION="If you don't yet have a global privacy plugin, <a href='https://www.youtube.com/watch?v=r56zcvek0Ik&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=90' target='_blank'>watch this tutorial</a> to see how to setup it up."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_PLUGIN_LABEL="Plugins"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ACTIONS_LABEL="Does the values stored in this admin view have a direct relationship with any user in Joomla?"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ACTIONS_DESCRIPTION="The Joomla Privacy Suite helps you comply with the privacy requirements of your component. So should this admin view in you component have any personal data related to any user in Joomla where your component is eventually installed by Joomla website owners/developers, then you should activate this integration with Joomla Privacy Suite."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_ACTIVATE_LABEL="Activate"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_ACTIVATE_DESCRIPTION="Turn on the integration."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_YES="Yes"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NO="No"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_PERMISSION_LABEL="Should we use permissions (where available) to determine the users access to data?"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_PERMISSION_DESCRIPTION="When you add permission control to view/edit/access a field value we can add that layer of security when a privacy event is taken."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_PERMISSIONS_LABEL="Permissions"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_PERMISSIONS_DESCRIPTION="As an extra layer of security you add permission control."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ANONYMIZE_LABEL="When a user makes a request to remove their data from the Joomla website, should we instead allow it to be anonymized?"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ANONYMIZE_DESCRIPTION="At times you may want to give website owners the option to anonymize data instead of deleting. This switch adds that option to the privacy integration."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_ANONYMIZE_LABEL="Anonymize"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_ANONYMIZE_DESCRIPTION="When deletion request is made, allow it to be anonymized instead."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_ANONYMIZE_FIELDS_LABEL="Select all fields that must be anonymized?"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_FIELD_LABEL="Field"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_FIELD="Field"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_VALUE_LABEL="Anonymize Value"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_VALUE_DESCRIPTION="RANDOM gives a random 8 digit value"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_USER_LINK_LABEL="How is the user linked to this admin view?"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_USER_LINK_DESCRIPTION="The privacy plugin needs to be able to get all rows that belongs to the user. Most of the time it is the rows that the user created, but it could also be via another user field or some custom relationship."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_USER_LINK_LABEL="User Link"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_USER_LINK_DESCRIPTION="Here you can setup the way we can link a user to their data in this admin view."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_CREATED_BY="Created By"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_OTHER_USER_FIELD="Other User Field"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_CUSTOM="Custom"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_CUSTOM_LINK_LABEL="PHP Custom Code"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_CUSTOM_LINK_DESCRIPTION="Only the lines of code to like this $user->id to a field in the table, see the code in the editor for an example."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_OTHER_USER_FIELD_LABEL="Select other User Field"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_OTHER_USER_FIELD_DESCRIPTION="Select the other field that is the user-id field you would like to use to link the data to the user."
\ No newline at end of file
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS="Content - Componentbuilder Privacy Tabs"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_DESCRIPTION="This plugin is used to link your components to the privacy suite of Joomla by adding a new privacy tab to the JCB admin views, where you can set all the required details for the integration."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Privacy Tabs (v.1.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to link your components to the privacy suite of Joomla by adding a new privacy tab to the JCB admin views, where you can set all the required details for the integration.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 17th August, 2019</small></p>"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_GLOBAL_PRIVACY="Global Privacy"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_PLUGIN="Plugin"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_PRIVACY="Privacy"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_SELECT_PRIVACY_PLUGIN_LABEL="Select your global privacy plugin here."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_SELECT_PRIVACY_PLUGIN_DESCRIPTION="If you don't yet have a global privacy plugin, <a href='https://www.youtube.com/watch?v=r56zcvek0Ik&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=90' target='_blank'>watch this tutorial</a> to see how to setup it up."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_PLUGIN_LABEL="Plugins"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ACTIONS_LABEL="Does the values stored in this admin view have a direct relationship with any user in Joomla?"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ACTIONS_DESCRIPTION="The Joomla Privacy Suite helps you comply with the privacy requirements of your component. So should this admin view in you component have any personal data related to any user in Joomla where your component is eventually installed by Joomla website owners/developers, then you should activate this integration with Joomla Privacy Suite."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_ACTIVATE_LABEL="Activate"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_ACTIVATE_DESCRIPTION="Turn on the integration."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_YES="Yes"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NO="No"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_PERMISSION_LABEL="Should we use permissions (where available) to determine the users access to data?"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_PERMISSION_DESCRIPTION="When you add permission control to view/edit/access a field value we can add that layer of security when a privacy event is taken."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_PERMISSIONS_LABEL="Permissions"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_PERMISSIONS_DESCRIPTION="As an extra layer of security you add permission control."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ANONYMIZE_LABEL="When a user makes a request to remove their data from the Joomla website, should we instead allow it to be anonymized?"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ANONYMIZE_DESCRIPTION="At times you may want to give website owners the option to anonymize data instead of deleting. This switch adds that option to the privacy integration."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_ANONYMIZE_LABEL="Anonymize"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_ANONYMIZE_DESCRIPTION="When deletion request is made, allow it to be anonymized instead."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_ANONYMIZE_FIELDS_LABEL="Select all fields that must be anonymized?"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_FIELD_LABEL="Field"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_FIELD="Field"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_VALUE_LABEL="Anonymize Value"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_VALUE_DESCRIPTION="RANDOM gives a random 8 digit value"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_USER_LINK_LABEL="How is the user linked to this admin view?"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_USER_LINK_DESCRIPTION="The privacy plugin needs to be able to get all rows that belongs to the user. Most of the time it is the rows that the user created, but it could also be via another user field or some custom relationship."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_USER_LINK_LABEL="User Link"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_USER_LINK_DESCRIPTION="Here you can setup the way we can link a user to their data in this admin view."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_CREATED_BY="Created By"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_OTHER_USER_FIELD="Other User Field"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_CUSTOM="Custom"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_CUSTOM_LINK_LABEL="PHP Custom Code"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_CUSTOM_LINK_DESCRIPTION="Only the lines of code to like this $user->id to a field in the table, see the code in the editor for an example."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_OTHER_USER_FIELD_LABEL="Select other User Field"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_OTHER_USER_FIELD_DESCRIPTION="Select the other field that is the user-id field you would like to use to link the data to the user."
\ No newline at end of file
diff --git a/language/en-GB/en-GB.plg_content_componentbuilderprivacytabs.sys.ini b/language/en-GB/en-GB.plg_content_componentbuilderprivacytabs.sys.ini
index c773804..b927a54 100644
--- a/language/en-GB/en-GB.plg_content_componentbuilderprivacytabs.sys.ini
+++ b/language/en-GB/en-GB.plg_content_componentbuilderprivacytabs.sys.ini
@@ -1,39 +1,39 @@
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS="Content - Componentbuilder Privacy Tabs"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_DESCRIPTION="This plugin is used to link your components to the privacy suite of Joomla by adding a new privacy tab to the JCB admin views, where you can set all the required details for the integration."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Privacy Tabs (v.1.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to link your components to the privacy suite of Joomla by adding a new privacy tab to the JCB admin views, where you can set all the required details for the integration.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 17th August, 2019</small></p>"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_GLOBAL_PRIVACY="Global Privacy"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_PLUGIN="Plugin"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_PRIVACY="Privacy"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_SELECT_PRIVACY_PLUGIN_LABEL="Select your global privacy plugin here."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_SELECT_PRIVACY_PLUGIN_DESCRIPTION="If you don't yet have a global privacy plugin, <a href='https://www.youtube.com/watch?v=r56zcvek0Ik&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=90' target='_blank'>watch this tutorial</a> to see how to setup it up."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_PLUGIN_LABEL="Plugins"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ACTIONS_LABEL="Does the values stored in this admin view have a direct relationship with any user in Joomla?"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ACTIONS_DESCRIPTION="The Joomla Privacy Suite helps you comply with the privacy requirements of your component. So should this admin view in you component have any personal data related to any user in Joomla where your component is eventually installed by Joomla website owners/developers, then you should activate this integration with Joomla Privacy Suite."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_ACTIVATE_LABEL="Activate"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_ACTIVATE_DESCRIPTION="Turn on the integration."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_YES="Yes"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NO="No"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_PERMISSION_LABEL="Should we use permissions (where available) to determine the users access to data?"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_PERMISSION_DESCRIPTION="When you add permission control to view/edit/access a field value we can add that layer of security when a privacy event is taken."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_PERMISSIONS_LABEL="Permissions"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_PERMISSIONS_DESCRIPTION="As an extra layer of security you add permission control."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ANONYMIZE_LABEL="When a user makes a request to remove their data from the Joomla website, should we instead allow it to be anonymized?"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ANONYMIZE_DESCRIPTION="At times you may want to give website owners the option to anonymize data instead of deleting. This switch adds that option to the privacy integration."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_ANONYMIZE_LABEL="Anonymize"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_ANONYMIZE_DESCRIPTION="When deletion request is made, allow it to be anonymized instead."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_ANONYMIZE_FIELDS_LABEL="Select all fields that must be anonymized?"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_FIELD_LABEL="Field"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_FIELD="Field"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_VALUE_LABEL="Anonymize Value"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_VALUE_DESCRIPTION="RANDOM gives a random 8 digit value"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_USER_LINK_LABEL="How is the user linked to this admin view?"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_USER_LINK_DESCRIPTION="The privacy plugin needs to be able to get all rows that belongs to the user. Most of the time it is the rows that the user created, but it could also be via another user field or some custom relationship."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_USER_LINK_LABEL="User Link"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_USER_LINK_DESCRIPTION="Here you can setup the way we can link a user to their data in this admin view."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_CREATED_BY="Created By"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_OTHER_USER_FIELD="Other User Field"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_CUSTOM="Custom"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_CUSTOM_LINK_LABEL="PHP Custom Code"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_CUSTOM_LINK_DESCRIPTION="Only the lines of code to like this $user->id to a field in the table, see the code in the editor for an example."
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_OTHER_USER_FIELD_LABEL="Select other User Field"
-PLG_CONTENTCOMPONENTBUILDERPRIVACYTABS_OTHER_USER_FIELD_DESCRIPTION="Select the other field that is the user-id field you would like to use to link the data to the user."
\ No newline at end of file
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS="Content - Componentbuilder Privacy Tabs"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_DESCRIPTION="This plugin is used to link your components to the privacy suite of Joomla by adding a new privacy tab to the JCB admin views, where you can set all the required details for the integration."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Privacy Tabs (v.1.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to link your components to the privacy suite of Joomla by adding a new privacy tab to the JCB admin views, where you can set all the required details for the integration.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 17th August, 2019</small></p>"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_GLOBAL_PRIVACY="Global Privacy"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_PLUGIN="Plugin"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_PRIVACY="Privacy"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_SELECT_PRIVACY_PLUGIN_LABEL="Select your global privacy plugin here."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_SELECT_PRIVACY_PLUGIN_DESCRIPTION="If you don't yet have a global privacy plugin, <a href='https://www.youtube.com/watch?v=r56zcvek0Ik&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=90' target='_blank'>watch this tutorial</a> to see how to setup it up."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_PLUGIN_LABEL="Plugins"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ACTIONS_LABEL="Does the values stored in this admin view have a direct relationship with any user in Joomla?"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ACTIONS_DESCRIPTION="The Joomla Privacy Suite helps you comply with the privacy requirements of your component. So should this admin view in you component have any personal data related to any user in Joomla where your component is eventually installed by Joomla website owners/developers, then you should activate this integration with Joomla Privacy Suite."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_ACTIVATE_LABEL="Activate"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_ACTIVATE_DESCRIPTION="Turn on the integration."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_YES="Yes"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NO="No"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_PERMISSION_LABEL="Should we use permissions (where available) to determine the users access to data?"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_PERMISSION_DESCRIPTION="When you add permission control to view/edit/access a field value we can add that layer of security when a privacy event is taken."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_PERMISSIONS_LABEL="Permissions"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_PERMISSIONS_DESCRIPTION="As an extra layer of security you add permission control."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ANONYMIZE_LABEL="When a user makes a request to remove their data from the Joomla website, should we instead allow it to be anonymized?"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_ANONYMIZE_DESCRIPTION="At times you may want to give website owners the option to anonymize data instead of deleting. This switch adds that option to the privacy integration."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_ANONYMIZE_LABEL="Anonymize"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_ANONYMIZE_DESCRIPTION="When deletion request is made, allow it to be anonymized instead."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_ANONYMIZE_FIELDS_LABEL="Select all fields that must be anonymized?"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_FIELD_LABEL="Field"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_FIELD="Field"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_VALUE_LABEL="Anonymize Value"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_VALUE_DESCRIPTION="RANDOM gives a random 8 digit value"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_USER_LINK_LABEL="How is the user linked to this admin view?"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NOTE_PLUGIN_USER_LINK_DESCRIPTION="The privacy plugin needs to be able to get all rows that belongs to the user. Most of the time it is the rows that the user created, but it could also be via another user field or some custom relationship."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_USER_LINK_LABEL="User Link"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_USER_LINK_DESCRIPTION="Here you can setup the way we can link a user to their data in this admin view."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_CREATED_BY="Created By"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_OTHER_USER_FIELD="Other User Field"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_CUSTOM="Custom"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_CUSTOM_LINK_LABEL="PHP Custom Code"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_CUSTOM_LINK_DESCRIPTION="Only the lines of code to like this $user->id to a field in the table, see the code in the editor for an example."
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_OTHER_USER_FIELD_LABEL="Select other User Field"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_OTHER_USER_FIELD_DESCRIPTION="Select the other field that is the user-id field you would like to use to link the data to the user."
\ No newline at end of file