diff --git a/lib/libraries/cms/application/administrator.php b/lib/libraries/cms/application/administrator.php
index e067cfb840..b342469f90 100644
--- a/lib/libraries/cms/application/administrator.php
+++ b/lib/libraries/cms/application/administrator.php
@@ -93,7 +93,7 @@ public function dispatch($component = null)
 
 		$document->setTitle($this->get('sitename') . ' - ' . JText::_('JADMINISTRATION'));
 		$document->setDescription($this->get('MetaDesc'));
-		$document->setGenerator('Joomla! - Open Source Content Management');
+		$document->setGenerator('Joomla Platform - Open Source Web Application Platform');
 
 		$contents = JComponentHelper::renderComponent($component);
 		$document->setBuffer($contents, 'component');
diff --git a/lib/libraries/cms/application/site.php b/lib/libraries/cms/application/site.php
index 5ebb12c82b..8de2f8b72e 100644
--- a/lib/libraries/cms/application/site.php
+++ b/lib/libraries/cms/application/site.php
@@ -181,11 +181,11 @@ public function dispatch($component = null)
 		// Add version number or not based on global configuration
 		if ($this->get('MetaVersion', 0))
 		{
-			$document->setGenerator('Joomla! - Open Source Content Management  - Version ' . JVERSION);
+			$document->setGenerator('Joomla Platform - Open Source Web Application Platform  - Version ' . JVERSION);
 		}
 		else
 		{
-			$document->setGenerator('Joomla! - Open Source Content Management');
+			$document->setGenerator('Joomla Platform - Open Source Web Application Platform');
 		}
 
 		$contents = JComponentHelper::renderComponent($component);
diff --git a/lib/libraries/joomla/document/document.php b/lib/libraries/joomla/document/document.php
index 25ded87605..eb4cba06a2 100644
--- a/lib/libraries/joomla/document/document.php
+++ b/lib/libraries/joomla/document/document.php
@@ -71,7 +71,7 @@ class JDocument
 	 *
 	 * @var    string
 	 */
-	public $_generator = 'Joomla! - Open Source Content Management';
+	public $_generator = 'Joomla Platform - Open Source Web Application Platform';
 
 	/**
 	 * Document modified date