diff --git a/README.md b/README.md
index 4df08543f..449bde814 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,7 @@ Where can you get support and help?
 + [Community Complaint](http://joomlacomponentbuilder.com/community-complaint)
 + [Open Issue On Github](https://github.com/vdm-io/Joomla-Component-Builder/issues) ^^
 
-Since JCB has [become a community](https://github.com/vdm-io/Joomla-Component-Builder/blob/staging/.github/SUPPORT.md) project [VDM.io](https://www.vdm.io/joomla-component-builder) is **no longer solely responsible** for support.
+Since JCB has [become a community](https://github.com/vdm-io/Joomla-Component-Builder/blob/staging/.github/SUPPORT.md) project [VDM.io](https://www.vdm.io/) is **no longer solely responsible** for support.
 
 We have started a [**JCB forum**](https://groups.google.com/a/vdm.io/d/forum/jcb) where you can post questions, about how things work, or if you need some kind of help in relation to your development of your components.
 
@@ -121,11 +121,11 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
 
 # Build Details
 
-+ *Company*: [Vast Development Method](https://www.vdm.io/)
++ *Community*: [Joomla Component Builder](http://joomlacomponentbuilder.com)
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
-+ *Name*: [Component Builder](http://joomlacomponentbuilder.com)
++ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 17th May, 2018
++ *Last Build*: 18th May, 2018
 + *Version*: 2.7.10
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
diff --git a/admin/README.txt b/admin/README.txt
index 4df08543f..449bde814 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -100,7 +100,7 @@ Where can you get support and help?
 + [Community Complaint](http://joomlacomponentbuilder.com/community-complaint)
 + [Open Issue On Github](https://github.com/vdm-io/Joomla-Component-Builder/issues) ^^
 
-Since JCB has [become a community](https://github.com/vdm-io/Joomla-Component-Builder/blob/staging/.github/SUPPORT.md) project [VDM.io](https://www.vdm.io/joomla-component-builder) is **no longer solely responsible** for support.
+Since JCB has [become a community](https://github.com/vdm-io/Joomla-Component-Builder/blob/staging/.github/SUPPORT.md) project [VDM.io](https://www.vdm.io/) is **no longer solely responsible** for support.
 
 We have started a [**JCB forum**](https://groups.google.com/a/vdm.io/d/forum/jcb) where you can post questions, about how things work, or if you need some kind of help in relation to your development of your components.
 
@@ -121,11 +121,11 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
 
 # Build Details
 
-+ *Company*: [Vast Development Method](https://www.vdm.io/)
++ *Community*: [Joomla Component Builder](http://joomlacomponentbuilder.com)
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
-+ *Name*: [Component Builder](http://joomlacomponentbuilder.com)
++ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 17th May, 2018
++ *Last Build*: 18th May, 2018
 + *Version*: 2.7.10
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
diff --git a/admin/compiler/joomla_3/JFormRule.php b/admin/compiler/joomla_3/JFormRule.php
index ed0d90e26..7e0c55c7c 100644
--- a/admin/compiler/joomla_3/JFormRule.php
+++ b/admin/compiler/joomla_3/JFormRule.php
@@ -26,6 +26,7 @@ defined('_JEXEC') or die('Restricted access');
 ?>
 ###BOM###
 
+// No direct access to this file
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Form\Form;
diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php
index c21c6ca64..b5ba1b20a 100644
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@@ -3885,7 +3885,7 @@ abstract class ComponentbuilderHelper
 	/**
 	 * Prepares the xml document
 	 */
-	public static function xls($rows,$fileName = null,$title = null,$subjectTab = null,$creator = 'Vast Development Method',$description = null,$category = null,$keywords = null,$modified = null)
+	public static function xls($rows,$fileName = null,$title = null,$subjectTab = null,$creator = 'Joomla Component Builder',$description = null,$category = null,$keywords = null,$modified = null)
 	{
 		// set the user
 		$user = JFactory::getUser();
@@ -3919,7 +3919,7 @@ abstract class ComponentbuilderHelper
 		
 		// Set document properties
 		$objPHPExcel->getProperties()->setCreator($creator)
-									 ->setCompany('Vast Development Method')
+									 ->setCompany('Joomla Component Builder')
 									 ->setLastModifiedBy($modified)
 									 ->setTitle($title)
 									 ->setSubject($subjectTab);
diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php
index fd2116d7f..f15300bc8 100644
--- a/admin/views/componentbuilder/tmpl/default.php
+++ b/admin/views/componentbuilder/tmpl/default.php
@@ -44,7 +44,7 @@ JHtml::_('behavior.tooltip');
 			</div>
 			<div class="span3">
 				<?php echo JHtml::_('bootstrap.startAccordion', 'dashboard_right', array('active' => 'vdm')); ?>
-					<?php echo JHtml::_('bootstrap.addSlide', 'dashboard_right', 'Vast Development Method', 'vdm'); ?>
+					<?php echo JHtml::_('bootstrap.addSlide', 'dashboard_right', 'Joomla Component Builder', 'vdm'); ?>
 						<?php echo $this->loadTemplate('vdm');?>
 					<?php echo JHtml::_('bootstrap.endSlide'); ?>
 				<?php echo JHtml::_('bootstrap.endAccordion'); ?>
diff --git a/componentbuilder.xml b/componentbuilder.xml
index ba09d738c..40c7ef8ae 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>17th May, 2018</creationDate>
+	<creationDate>18th May, 2018</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://joomlacomponentbuilder.com</authorUrl>
diff --git a/script.php b/script.php
index 15bc56478..8925e8928 100644
--- a/script.php
+++ b/script.php
@@ -2918,7 +2918,7 @@ class com_componentbuilderInstallerScript
 		// little notice as after service, in case of bad experience with component.
 		echo '<h2>Did something go wrong? Are you disappointed?</h2>
 		<p>Please let me know at <a href="mailto:llewellyn@joomlacomponentbuilder.com">llewellyn@joomlacomponentbuilder.com</a>.
-		<br />We at Vast Development Method are committed to building extensions that performs proficiently! You can help us, really!
+		<br />We at Joomla Component Builder are committed to building extensions that performs proficiently! You can help us, really!
 		<br />Send me your thoughts on improvements that is needed, trust me, I will be very grateful!
 		<br />Visit us at <a href="http://joomlacomponentbuilder.com" target="_blank">http://joomlacomponentbuilder.com</a> today!</p>';
 	}