Index: t3lib/interfaces/interface.t3lib_spritemanager_spriteicongenerator.php
===================================================================
--- t3lib/interfaces/interface.t3lib_spritemanager_spriteicongenerator.php	(revision 7796)
+++ t3lib/interfaces/interface.t3lib_spritemanager_spriteicongenerator.php	(working copy)
@@ -27,25 +27,25 @@
 
 
 /**
- * Interface all handlers in t3lib_spriteManager has to implement.
+ * Interface all handlers in t3lib_spritemanager have to implement.
  *
  * @author	Steffen Ritter <info@steffen-ritter.net>
  * @package TYPO3
  * @subpackage t3lib
  */
-interface t3lib_spriteManager_spriteIconGenerator {
+interface t3lib_spritemanager_SpriteIconGenerator {
 
 	/**
 	 * the implementation of this function has to do the main task
 	 * this function will be called if the extension list changed or
-	 * registered icons in TBE_STYLES[spriteManager] changed
+	 * registered icons in TBE_STYLES[spritemanager] changed
 	 *
 	 * @return void
 	 */
 	public function generate();
 
 	/**
-	 * the spriteManager will call this function after the call to "generate"
+	 * The sprite manager will call this function after the call to "generate"
 	 * it should return an array of all sprite-icon-names generated through the run
 	 *
 	 * @retun array all generated/detected sprite-icon-names
Index: t3lib/class.t3lib_spritemanager.php
===================================================================
--- t3lib/class.t3lib_spritemanager.php	(revision 7796)
+++ t3lib/class.t3lib_spritemanager.php	(working copy)
@@ -30,21 +30,21 @@
  * TYPO3 Sprite Manager, it is initiated from BE and FE if BE-User ist active
  * Its task will be to build css-definitions for registered Icons of Extensions,
  * TCA-Tables and so on, so that they will be usuable through sprite-icon-api.
- * An special configurable handler-class will process the "real" task so that the user
- * may differ between details of generation and their caching.
+ * An special configurable handler-class will process the "real" task so that
+ * the user may differ between details of generation and their caching.
  *
  * @author	Steffen Ritter <info@steffen-ritter.net>
  * @package TYPO3
  * @subpackage t3lib
  */
-class t3lib_spriteManager {
+class t3lib_SpriteManager {
 	/**
 	 * @var string
 	 */
 	public static $tempPath = 'typo3temp/sprites/';
 
 	/**
-	 *@var t3lib_spriteManager_spriteIconGenerator
+	 *@var t3lib_spritemanager_SpriteIconGenerator
 	 */
 	protected $handler = NULL;
 
@@ -67,12 +67,12 @@
 	 */
 	function __construct($regenerate = TRUE) {
 			// we check for existance of our targetDirectory
-		if (!is_dir(PATH_site . t3lib_spriteManager::$tempPath)) {
-			t3lib_div::mkdir(PATH_site . t3lib_spriteManager::$tempPath);
+		if (!is_dir(PATH_site . t3lib_SpriteManager::$tempPath)) {
+			t3lib_div::mkdir(PATH_site . t3lib_SpriteManager::$tempPath);
 		}
 			// create a fileName, the hash includes all icons and css-styles registered and the extlist
-		$this->tempFileName = PATH_site . t3lib_spriteManager::$tempPath .
-							md5(serialize($GLOBALS['TBE_STYLES']['spriteManager']) .
+		$this->tempFileName = PATH_site . t3lib_SpriteManager::$tempPath .
+							md5(serialize($GLOBALS['TBE_STYLES']['spritemanager']) .
 							$GLOBALS['TYPO3_CONF_VARS']['EXT']['extList']) . '.inc';
 			// if no cache-file for the current config ist present, regenerate it
 		if(!@file_exists($this->tempFileName)) {
@@ -81,21 +81,21 @@
 				$handlerClass = (
 					$GLOBALS['TYPO3_CONF_VARS']['BE']['spriteIconGenerator_handler'] ?
 					$GLOBALS['TYPO3_CONF_VARS']['BE']['spriteIconGenerator_handler'] :
-					't3lib_spriteManager_simpleHandler'
+					't3lib_spritemanager_SimpleHandler'
 				);
 				$this->handler = t3lib_div::makeInstance($handlerClass);
 					// check if the handler could be loaded and implements the needed interface
-				if (!$this->handler || !($this->handler instanceof t3lib_spriteManager_spriteIconGenerator)) {
+				if (!$this->handler || !($this->handler instanceof t3lib_spritemanager_SpriteIconGenerator)) {
 					throw new Exception(
 						"class in TYPO3_CONF_VARS[BE][spriteIconGenerator_handler] does not exist,
-						or does not implement t3lib_spriteManager_spriteIconGenerator"
+						or does not implement t3lib_spritemanager_SpriteIconGenerator"
 					);
 				}
 					// all went good? to go for rebuild
 				$this->rebuildCache();
 			} else {
 					// use old file if present
-				list($this->tempFileName) = t3lib_div::getFilesInDir(PATH_site . t3lib_spriteManager::$tempPath, 'inc', 1);
+				list($this->tempFileName) = t3lib_div::getFilesInDir(PATH_site . t3lib_SpriteManager::$tempPath, 'inc', 1);
 			}
 		}
 	}
@@ -115,13 +115,13 @@
 		foreach ($GLOBALS['TBE_STYLES']['skins'] as $skinName => $skinData) {
 			$availableSkinIcons = array_merge($availableSkinIcons, (array)$skinData['availableSpriteIcons']);
 		}
-		
+
 			// merge icon names whith them provided by the skin,
 			// registered from "complete sprites" and the ones detected
 			// by the handlerclass
 		$this->iconNames = array_merge(
 			$availableSkinIcons,
-			(array) $GLOBALS['TBE_STYLES']['spriteManager']['spriteIconsAvailable'],
+			(array) $GLOBALS['TBE_STYLES']['spritemanager']['spriteIconsAvailable'],
 			$this->handler->getAvailableIconNames()
 		);
 
@@ -130,7 +130,7 @@
 		$fileContent = '<?php $GLOBALS[\'TBE_STYLES\'][\'spriteIconApi\'][\'iconsAvailable\'] = unserialize(stripslashes(\'' . $cacheString . '\')); ?>';
 
 			// delete old cache files
-		$oldFiles = t3lib_div::getFilesInDir(PATH_site . t3lib_spriteManager::$tempPath, 'inc', 1);
+		$oldFiles = t3lib_div::getFilesInDir(PATH_site . t3lib_SpriteManager::$tempPath, 'inc', 1);
 		foreach ($oldFiles as $file) {
 			@unlink($file);
 		}
@@ -164,12 +164,12 @@
 	 * @parram string $styleSheetFile	the name of the styleshet file relative to PATH_site
 	 */
 	public static function addIconSprite(array $icons, $styleSheetFile) {
-		$GLOBALS['TBE_STYLES']['spriteManager']['spriteIconsAvailable'] = array_merge(
-			$GLOBALS['TBE_STYLES']['spriteManager']['spriteIconsAvailable'],
+		$GLOBALS['TBE_STYLES']['spritemanager']['spriteIconsAvailable'] = array_merge(
+			$GLOBALS['TBE_STYLES']['spritemanager']['spriteIconsAvailable'],
 			$icons
 		);
 
-		$GLOBALS['TBE_STYLES']['spriteManager']['cssFiles'][] = $styleSheetFile;
+		$GLOBALS['TBE_STYLES']['spritemanager']['cssFiles'][] = $styleSheetFile;
 	}
 
 	/**
@@ -181,7 +181,7 @@
 	 */
 	public static function addSingleIcons(array $icons, $extKey = '') {
 		foreach ($icons as $iconName => $iconFile) {
-			$GLOBALS['TBE_STYLES']['spriteManager']['singleIcons']['extensions-' . $extKey . '-' . $iconName] = $iconFile;
+			$GLOBALS['TBE_STYLES']['spritemanager']['singleIcons']['extensions-' . $extKey . '-' . $iconName] = $iconFile;
 		}
 	}
 }
Index: t3lib/config_default.php
===================================================================
--- t3lib/config_default.php	(revision 7796)
+++ t3lib/config_default.php	(working copy)
@@ -257,7 +257,7 @@
 		'explicitConfirmationOfTranslation' => FALSE,	// If set, then the diff-data of localized records is not saved automatically when updated but requires that a translator clicks the special finish_translation/save/close button that becomes available.
 		'elementVersioningOnly' => FALSE,		// If true, only element versioning is allowed in the backend. This is recommended for new installations of TYPO3 4.2+ since "page" and "branch" versioning types are known for the drawbacks of loosing ids and "element" type versions supports moving now.
 		'versionNumberInFilename' => FALSE,	// Boolean. If true, included CSS and JS files will have the timestamp embedded in the filename, ie. filename.1269312081.js. This will make browsers and proxies reload the files if they change (thus avoiding caching issues). IMPORTANT: this feature requires this .htaccess rule to work: RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteRule ^(.+)\.(\d+)\.(php|js|css|png|jpg|gif|gzip)$ $1.$3 [L]. If false the filemtime will be appended as a query-string.
-		'spriteIconGenerator_handler' => '',	// String: Used to register own/other spriteGenerating Handler, they have to implement the interface t3lib_spriteManager_spriteIconGenerator
+		'spriteIconGenerator_handler' => '',	// String: Used to register own/other spriteGenerating Handler, they have to implement the interface t3lib_spritemanager_SpriteIconGenerator
 		'allowDonateWindow' => TRUE,			// Boolean. Defines whether to display a TYPO3 donate window to admin users that have been working with the system for more than three months.
 		'AJAX' => array(				// array of key-value pairs for a unified use of AJAX calls in the TYPO3 backend. Keys are the unique ajaxIDs where the value will be resolved to call a method in an object. See ajax.php and the classes/class.typo3ajax.php for more information.
 			'SC_alt_db_navframe::expandCollapse'                => 'typo3/alt_db_navframe.php:SC_alt_db_navframe->ajaxExpandCollapse',
Index: t3lib/core_autoload.php
===================================================================
--- t3lib/core_autoload.php	(revision 7796)
+++ t3lib/core_autoload.php	(working copy)
@@ -128,7 +128,7 @@
 	't3lib_utility_mail' => PATH_t3lib . 'utility/class.t3lib_utility_mail.php',
 	't3lib_spritemanager' => PATH_t3lib . 'class.t3lib_spritemanager.php',
 	't3lib_spritemanager_spriteicongenerator' => PATH_t3lib . 'interfaces/interface.t3lib_spritemanager_spriteicongenerator.php',
-	't3lib_spritemanager_simplehandler' => PATH_t3lib . 'spriteManager/class.t3lib_spritemanager_simplehandler.php',
+	't3lib_spritemanager_simplehandler' => PATH_t3lib . 'spritemanager/class.t3lib_spritemanager_simplehandler.php',
 	'tslib_adminpanel' => PATH_tslib . 'class.tslib_adminpanel.php',
 	'tslib_cobj' => PATH_tslib . 'class.tslib_content.php',
 	'tslib_frameset' => PATH_tslib . 'class.tslib_content.php',
Index: t3lib/spritemanager/class.t3lib_spritemanager_simplehandler.php
===================================================================
--- t3lib/spritemanager/class.t3lib_spritemanager_simplehandler.php	(revision 7796)
+++ t3lib/spritemanager/class.t3lib_spritemanager_simplehandler.php	(working copy)
@@ -27,8 +27,8 @@
 
 
 /**
- * A class with an concrete implementation of t3lib_spriteManager_spriteIconGenerator.
- * It is the standard / fallback handler of the spriteManager.
+ * A class with an concrete implementation of t3lib_spritemanager_SpriteIconGenerator.
+ * It is the standard / fallback handler of the sprite manager.
  * This implementation won't generate sprites at all. It will just render css-definitions
  * for all registered icons so that they may be used through t3lib_iconWorks::getSpriteIcon*
  * Without the css classes generated here, icons of for example tca records would be empty.
@@ -37,7 +37,7 @@
  * @package TYPO3
  * @subpackage t3lib
  */
-class t3lib_spriteManager_simpleHandler implements t3lib_spriteManager_spriteIconGenerator {
+class t3lib_spritemanager_SimpleHandler implements t3lib_spritemanager_SpriteIconGenerator {
 	/**
 	 * all "registered" Icons available through sprite-api will cumuluated within
 	 * @var array
@@ -48,7 +48,7 @@
 	 * contains the content of the CSS file to write
 	 * @var String
 	 */
-	protected $styleSheetData = "/* Auto-Generated via t3lib_spriteManager_simpleHandler */\n";
+	protected $styleSheetData = "/* Auto-Generated via t3lib_spritemanager_SimpleHandler */\n";
 
 	/**
 	 * css-template for each sprite-icon of an tca-record-symbol
@@ -83,13 +83,13 @@
 	 * @return void
 	 */
 	function __construct() {
-			// the fileName is prefixed with "z" since the concatenator orders files per name
-		$this->cssTcaFile = PATH_site . t3lib_spriteManager::$tempPath . 'zextensions.css';
+			// the file name is prefixed with "z" since the concatenator orders files per name
+		$this->cssTcaFile = PATH_site . t3lib_SpriteManager::$tempPath . 'zextensions.css';
 	}
 
 	/**
-	 * Interface function. This will be called from the spriteManager to refresh
-	 * all caches.
+	 * Interface function. This will be called from the sprite manager to
+	 * refresh all caches.
 	 *
 	 * @return void
 	 */
@@ -110,7 +110,7 @@
 
 	/**
 	 * This function builds an css class for every single icon registered via
-	 * t3lib_spriteManager::addSingleIcons to use them via t3lib_iconWorks::getSpriteIcon
+	 * t3lib_SpriteManager::addSingleIcons to use them via t3lib_iconWorks::getSpriteIcon
 	 * In the simpleHandler the icon just will be added as css-background-image.
 	 *
 	 * @return void
@@ -120,7 +120,7 @@
 			// in order to set the background-image URL paths correct
 		$iconPath = '../../' . TYPO3_mainDir;
 
-		foreach((array) $GLOBALS['TBE_STYLES']['spriteManager']['singleIcons'] as $iconName => $iconFile) {
+		foreach((array) $GLOBALS['TBE_STYLES']['spritemanager']['singleIcons'] as $iconName => $iconFile) {
 			$css = str_replace('###NAME###', str_replace('extensions-', '', $iconName), $this->styleSheetTemplateExtIcons);
 			$css = str_replace('###IMAGE###', t3lib_div::resolveBackPath($iconPath . $iconFile), $css);
 
@@ -130,9 +130,12 @@
 	}
 
 	/**
-	 * loads all StyleSheets Files registered through t3lib_spriteManager::addIconSprite
-	 * in fact the stylesheet-files are copied to t3lib_spriteManager::tempPath where they automatically
-	 * will be included from via template.php and t3lib_compressor.
+	 * Loads all StyleSheets Files registered through
+	 * t3lib_SpriteManager::::addIconSprite
+	 *
+	 * In fact the stylesheet-files are copied to t3lib_SpriteManager::tempPath
+	 * where they automatically will be included from via template.php and
+	 * t3lib_compressor.
 	 *
 	 * @return void
 	 */
@@ -140,23 +143,23 @@
 			// saves which CSS Files are currently "allowed to be in place"
 		$allowedCssFilesinTempDir = array(basename($this->cssTcaFile));
 			// process every registeres file
-		foreach((array)$GLOBALS['TBE_STYLES']['spriteManager']['cssFiles'] as $file) {
+		foreach((array)$GLOBALS['TBE_STYLES']['spritemanager']['cssFiles'] as $file) {
 			$fileName = basename($file);
 				// file should be present
 			$allowedCssFilesinTempDir[] = $fileName;
 				// get-Cache Filename
 			$unique = md5($fileName . filemtime(PATH_site . $file) . filesize(PATH_site . $file));
-			$cacheFile = PATH_site . t3lib_spriteManager::$tempPath . $fileName . $unique . '.css';
+			$cacheFile = PATH_site . t3lib_SpriteManager::$tempPath . $fileName . $unique . '.css';
 			if(!file_exists($cacheFile)) {
 				copy(PATH_site . $file, $cacheFile);
 			}
 		}
 			// get all .css files in dir
-		$cssFilesPresentInTempDir = t3lib_div::getFilesInDir(PATH_site . t3lib_spriteManager::$tempPath , '.css', 0);
+		$cssFilesPresentInTempDir = t3lib_div::getFilesInDir(PATH_site . t3lib_SpriteManager::$tempPath , '.css', 0);
 			// and delete old ones which are not needed anymore
 		$filesToDelete = array_diff($cssFilesPresentInTempDir, $allowedCssFilesinTempDir);
 		foreach ($filesToDelete as $file) {
-			unlink(PATH_site . t3lib_spriteManager::$tempPath . $file);
+			unlink(PATH_site . t3lib_SpriteManager::$tempPath . $file);
 		}
 	}
 
Index: typo3/sysext/cms/tslib/index_ts.php
===================================================================
--- typo3/sysext/cms/tslib/index_ts.php	(revision 7796)
+++ typo3/sysext/cms/tslib/index_ts.php	(working copy)
@@ -345,10 +345,10 @@
 // Admin Panel & Frontend editing
 // *****************************************
 if ($TSFE->beUserLogin) {
-		// if a BE User is present load the spriteManager for frontend-editing
-	$spriteManager = t3lib_div::makeInstance('t3lib_spriteManager', FALSE);
+		// if a BE User is present load, the sprite manager for frontend-editing
+	$spriteManager = t3lib_div::makeInstance('t3lib_SpriteManager', FALSE);
 	$spriteManager->loadCacheFile();
-	
+
 	$BE_USER->initializeFrontendEdit();
  	if ($BE_USER->adminPanel instanceof tslib_AdminPanel) {
 		$LANG = t3lib_div::makeInstance('language');
Index: typo3/init.php
===================================================================
--- typo3/init.php	(revision 7796)
+++ typo3/init.php	(working copy)
@@ -394,7 +394,7 @@
 }
 
 	// load TYPO3 SpriteGenerating API
-$spriteManager = t3lib_div::makeInstance('t3lib_spriteManager', TRUE);
+$spriteManager = t3lib_div::makeInstance('t3lib_SpriteManager', TRUE);
 $spriteManager->loadCacheFile();