Index: typo3/sysext/cms/tslib/content/class.tslib_content_records.php
===================================================================
--- typo3/sysext/cms/tslib/content/class.tslib_content_records.php	(revision 9214)
+++ typo3/sysext/cms/tslib/content/class.tslib_content_records.php	(revision )
@@ -59,7 +59,7 @@
 				}
 			}
 
-			$loadDB = t3lib_div::makeInstance('FE_loadDBGroup');
+			$loadDB = t3lib_div::makeInstance('tslib_frontendLoadDbGroup');
 			$loadDB->start($conf['source'], $allowedTables);
 			foreach ($loadDB->tableArray as $table => $v) {
 				if (is_array($GLOBALS['TCA'][$table])) {
Index: typo3/sysext/cms/tslib/class.tslib_search.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_search.php	(revision 8742)
+++ typo3/sysext/cms/tslib/class.tslib_search.php	(revision )
@@ -27,7 +27,7 @@
 /**
  * Searching in database tables, typ. "pages" and "tt_content"
  * Used to generate search queries for TypoScript.
- * The class is included from "class.tslib_pagegen.php" based on whether there has been detected content in the GPvar "sword"
+ * The class is included from "class.tslib_pagegeneration.php" based on whether there has been detected content in the GPvar "sword"
  *
  * $Id: class.tslib_search.php 8742 2010-08-30 18:55:32Z baschny $
  * Revised for TYPO3 3.6 June/2003 by Kasper Skårhøj
Index: t3lib/class.t3lib_tstemplate.php
===================================================================
--- t3lib/class.t3lib_tstemplate.php	(revision 9008)
+++ t3lib/class.t3lib_tstemplate.php	(revision )
@@ -1321,7 +1321,7 @@
 	 * @param	boolean		If set, then only the site title is outputted (from $this->setup['sitetitle'])
 	 * @param	boolean		If set, then "sitetitle" and $title is swapped
 	 * @return	string		The page title on the form "[sitetitle]: [input-title]". Not htmlspecialchar()'ed.
-	 * @see tslib_fe::tempPageCacheContent(), TSpagegen::renderContentWithHeader()
+	 * @see tslib_fe::tempPageCacheContent(), tslib_pageGeneration::renderContentWithHeader()
 	 */
 	function printTitle($title,$no_title=0,$titleFirst=0)	{
 		$st = trim($this->setup['sitetitle']) ? $this->setup['sitetitle']:'';
@@ -1451,7 +1451,7 @@
 	 * @param	string		If you set this value to something else than a blank string, then the typeNumber used in the link will be forced to this value. Normally the typeNum is based on the target set OR on $GLOBALS['TSFE']->config['config']['forceTypeValue'] if found.
 	 * @param	string		The target Doamin, if any was detected in typolink
 	 * @return	array		Contains keys like "totalURL", "url", "sectionIndex", "linkVars", "no_cache", "type", "target" of which "totalURL" is normally the value you would use while the other keys contains various parts that was used to construct "totalURL"
-	 * @see tslib_frameset::frameParams(), tslib_cObj::typoLink(), tslib_cObj::SEARCHRESULT(), TSpagegen::pagegenInit(), tslib_menu::link()
+	 * @see tslib_frameset::frameParams(), tslib_cObj::typoLink(), tslib_cObj::SEARCHRESULT(), tslib_pageGeneration::pagegenInit(), tslib_menu::link()
 	 */
 	function linkData($page, $oTarget, $no_cache, $script, $overrideArray='', $addParams='', $typeOverride='', $targetDomain='') {
 		global $TYPO3_CONF_VARS;
Index: typo3/sysext/cms/tslib/class.tslib_content.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_content.php	(revision 9278)
+++ typo3/sysext/cms/tslib/class.tslib_content.php	(revision )
@@ -7626,7 +7626,7 @@
 	 *
 	 * @param	array		The TypoScript properties of the PAGE object property "frameSet.". See link.
 	 * @return	string		A <frameset> tag.
-	 * @see TSpagegen::renderContentWithHeader()
+	 * @see tslib_pageGeneration::renderContentWithHeader()
 	 * @link http://typo3.org/doc.0.html?&tx_extrepmgm_pi1[extUid]=270&tx_extrepmgm_pi1[tocEl]=343&cHash=41ca925386
 	 */
 	function make($setup) {
Index: typo3/sysext/cms/tslib/class.tslib_pagegen.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_pagegen.php	(revision 9293)
+++ typo3/sysext/cms/tslib/class.tslib_pagegeneration.php	(revision )
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 1999-2010 Kasper Skårhøj (kasperYYYY@typo3.com)
+*  (c) 1999-2010 Kasper Skårhøj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -28,18 +28,18 @@
  * Libraries for pagegen.php
  * The script "pagegen.php" is included by "index_ts.php" when a page is not cached but needs to be rendered.
  *
- * $Id: class.tslib_pagegen.php 9293 2010-11-06 10:45:44Z steffenk $
- * Revised for TYPO3 3.6 June/2003 by Kasper Skårhøj
+ * $Id: class.tslib_pagegeneration.php 9293 2010-11-06 10:45:44Z steffenk $
+ * Revised for TYPO3 3.6 June/2003 by Kasper Skårhøj
  * XHTML compliant
  *
- * @author	Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author	Kasper Skårhøj <kasperYYYY@typo3.com>
  */
 /**
  * [CLASS/FUNCTION INDEX of SCRIPT]
  *
  *
  *
- *   88: class TSpagegen
+ *   88: class tslib_pageGeneration
  *   95:     function pagegenInit()
  *  271:     function getIncFiles()
  *  304:     function JSeventFunctions()
@@ -79,13 +79,13 @@
  * Class for starting TypoScript page generation
  *
  * The class is not instantiated as an objects but called directly with the "::" operator.
- * eg: TSpagegen::pagegenInit()
+ * eg: tslib_pageGeneration::pagegenInit()
  *
- * @author	Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author	Kasper Skårhøj <kasperYYYY@typo3.com>
  * @package TYPO3
  * @subpackage tslib
  */
-class TSpagegen {
+class tslib_pageGeneration {
 
 	/**
 	 * Setting some vars in TSFE, primarily based on TypoScript config settings.
@@ -191,7 +191,7 @@
 					if (!is_array($GET[$val]))	{
 						$tmpVal = rawurlencode($GET[$val]);
 
-						if ($test && !TSpagegen::isAllowedLinkVarValue($tmpVal,$test))	{
+						if ($test && !self::isAllowedLinkVarValue($tmpVal,$test))	{
 							continue;	// Error: This value was not allowed for this key
 						}
 
@@ -320,7 +320,7 @@
 		if ($GLOBALS['TSFE']->config['config']['disableAllHeaderCode'])	{
 			$GLOBALS['TSFE']->content = $pageContent;
 		} else {
-			TSpagegen::renderContentWithHeader($pageContent);
+			self::renderContentWithHeader($pageContent);
 		}
 		$GLOBALS['TT']->pull($GLOBALS['TT']->LR?$GLOBALS['TSFE']->content:'');
 		$GLOBALS['TT']->decStackPointer();
@@ -502,7 +502,7 @@
 			}
 			if (count($temp_styleLines)) {
 				if ($GLOBALS['TSFE']->config['config']['inlineStyle2TempFile']) {
-					$pageRenderer->addCssFile(TSpagegen::inline2TempFile(implode(LF, $temp_styleLines), 'css'));
+					$pageRenderer->addCssFile(self::inline2TempFile(implode(LF, $temp_styleLines), 'css'));
 				} else {
 					$pageRenderer->addCssInlineBlock('TSFEinlineStyle', implode(LF, $temp_styleLines));
 				}
@@ -631,7 +631,7 @@
 
 		if (trim($style)) {
 			if ($GLOBALS['TSFE']->config['config']['inlineStyle2TempFile']) {
-				$pageRenderer->addCssFile(TSpagegen::inline2TempFile($style, 'css'));
+				$pageRenderer->addCssFile(self::inline2TempFile($style, 'css'));
 			} else {
 				$pageRenderer->addCssInlineBlock('additionalTSFEInlineStyle', $style);
 			}
@@ -827,7 +827,7 @@
 		} else {
 			$GLOBALS['TSFE']->INTincScript_loadJSCode();
 		}
-		$JSef = TSpagegen::JSeventFunctions();
+		$JSef = self::JSeventFunctions();
 
 			// Adding default Java Script:
 		$scriptJsCode = '
@@ -950,7 +950,7 @@
 			if ($inlineJSint) {
 				$pageRenderer->addJsInlineCode('TS_inlineJSint', $inlineJSint, $GLOBALS['TSFE']->config['config']['minifyJS']);
 			}
-			$pageRenderer->addJsFile(TSpagegen::inline2TempFile($scriptJsCode . $inlineJS, 'js'), 'text/javascript', $GLOBALS['TSFE']->config['config']['minifyJS']);
+			$pageRenderer->addJsFile(self::inline2TempFile($scriptJsCode . $inlineJS, 'js'), 'text/javascript', $GLOBALS['TSFE']->config['config']['minifyJS']);
 
 			if ($inlineFooterJs) {
 				$inlineFooterJSint = '';
@@ -958,7 +958,7 @@
 				if ($inlineFooterJSint) {
 					$pageRenderer->addJsFooterInlineCode('TS_inlineFooterJSint', $inlineFooterJSint, $GLOBALS['TSFE']->config['config']['minifyJS']);
 				}
-				$pageRenderer->addJsFooterFile(TSpagegen::inline2TempFile($inlineFooterJs, 'js'), 'text/javascript', $GLOBALS['TSFE']->config['config']['minifyJS']);
+				$pageRenderer->addJsFooterFile(self::inline2TempFile($inlineFooterJs, 'js'), 'text/javascript', $GLOBALS['TSFE']->config['config']['minifyJS']);
 			}
 		} else {
 				// include only inlineJS
@@ -1073,7 +1073,7 @@
 	/*************************
 	 *
 	 * Helper functions
-	 * Remember: Calls internally must still be done on the non-instantiated class: TSpagegen::inline2TempFile()
+	 * Remember: Calls internally must still be done on the non-instantiated class: tslib_pageGeneration::inline2TempFile()
 	 *
 	 *************************/
 
@@ -1178,12 +1178,12 @@
 /**
  * Class for fetching record relations for the frontend.
  *
- * @author	Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author	Kasper Skårhøj <kasperYYYY@typo3.com>
  * @package TYPO3
  * @subpackage tslib
  * @see tslib_cObj::RECORDS()
  */
-class FE_loadDBGroup extends t3lib_loadDBGroup {
+class tslib_frontendLoadDbGroup extends t3lib_loadDBGroup {
 	var $fromTC = 0;	// Means that everything is returned instead of only uid and label-field
 }
 
Index: t3lib/class.t3lib_timetrack.php
===================================================================
--- t3lib/class.t3lib_timetrack.php	(revision 9098)
+++ t3lib/class.t3lib_timetrack.php	(revision )
@@ -83,7 +83,7 @@
  * @author  Kasper Skårhøj <kasperYYYY@typo3.com>
  * @package TYPO3
  * @subpackage t3lib
- * @see t3lib_tsfeBeUserAuth, tslib_fe, tslib_cObj, TSpagegen
+ * @see t3lib_tsfeBeUserAuth, tslib_fe, tslib_cObj, tslib_pageGeneration
  */
 class t3lib_timeTrack {
 	var $starttime = 0;             // Is loaded with the millisecond time when this object is created
@@ -235,7 +235,7 @@
 	 * Increases the stack pointer
 	 *
 	 * @return	void
-	 * @see decStackPointer(), TSpagegen::renderContent(), tslib_cObj::cObjGetSingle()
+	 * @see decStackPointer(), tslib_pageGeneration::renderContent(), tslib_cObj::cObjGetSingle()
 	 */
 	public function incStackPointer() {
 		$this->tsStackPointer++;
@@ -246,7 +246,7 @@
 	 * Decreases the stack pointer
 	 *
 	 * @return	void
-	 * @see incStackPointer(), TSpagegen::renderContent(), tslib_cObj::cObjGetSingle()
+	 * @see incStackPointer(), tslib_pageGeneration::renderContent(), tslib_cObj::cObjGetSingle()
 	 */
 	public function decStackPointer() {
 		unset($this->tsStack[$this->tsStackPointer]);
Index: typo3/sysext/cms/ext_autoload.php
===================================================================
--- typo3/sysext/cms/ext_autoload.php	(revision 9209)
+++ typo3/sysext/cms/ext_autoload.php	(revision )
@@ -21,8 +21,8 @@
 	'tslib_gmenu' => PATH_tslib . 'class.tslib_menu.php',
 	'tslib_imgmenu' => PATH_tslib . 'class.tslib_menu.php',
 	'tslib_jsmenu' => PATH_tslib . 'class.tslib_menu.php',
-	'tspagegen' => PATH_tslib . 'class.tslib_pagegen.php',
-	'fe_loaddbgroup' => PATH_tslib . 'class.tslib_pagegen.php',
+	'tslib_pagegeneration' => PATH_tslib . 'class.tslib_pagegeneration.php',
+	'tslib_frontendloaddbgroup' => PATH_tslib . 'class.tslib_pagegeneration.php',
 	'tslib_pibase' => PATH_tslib . 'class.tslib_pibase.php',
 	'tslib_search' => PATH_tslib . 'class.tslib_search.php',
 	'tslib_extdirecteid' => PATH_tslib . 'class.tslib_extdirecteid.php',
Index: typo3/sysext/cms/tslib/pagegen.php
===================================================================
--- typo3/sysext/cms/tslib/pagegen.php	(revision 8742)
+++ typo3/sysext/cms/tslib/pagegen.php	(revision )
@@ -45,7 +45,7 @@
 // *********************************
 // Initialization of some variables
 // *********************************
-TSpagegen::pagegenInit();
+tslib_pageGeneration::pagegenInit();
 
 
 // *************************
@@ -57,7 +57,7 @@
 // ******************************
 // LIBRARY INCLUSION, TypoScript
 // ******************************
-$temp_incFiles=TSpagegen::getIncFiles();
+$temp_incFiles=tslib_pageGeneration::getIncFiles();
 foreach ($temp_incFiles as $temp_file) {
 	include_once('./'.$temp_file);
 }
@@ -73,7 +73,7 @@
 // If this is an array, it's a sign that this script is included in order to include certain PHP_SCRIPT_INT-scripts
 if (!$GLOBALS['TSFE']->isINTincScript())		{
 	$TT->push('pagegen.php, render');
-	TSpagegen::renderContent();
+	tslib_pageGeneration::renderContent();
 	$GLOBALS['TSFE']->setAbsRefPrefix();
 	$TT->pull();
 }
Index: typo3/sysext/cms/tslib/class.tslib_menu.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_menu.php	(revision 9008)
+++ typo3/sysext/cms/tslib/class.tslib_menu.php	(revision )
@@ -491,7 +491,7 @@
 						if ($value=='') {
 							$value=$this->id;
 						}
-						$loadDB = t3lib_div::makeInstance('FE_loadDBGroup');
+						$loadDB = t3lib_div::makeInstance('tslib_frontendLoadDbGroup');
 						$loadDB->start($value, 'pages');
 						$loadDB->additionalWhere['pages']=tslib_cObj::enableFields('pages');
 						$loadDB->getFromDB();