diff --git a/e107_handlers/Shims/e_shims.php b/e107_handlers/Shims/eShims.php
similarity index 87%
rename from e107_handlers/Shims/e_shims.php
rename to e107_handlers/Shims/eShims.php
index dcb2e9b8c..e840f9cca 100644
--- a/e107_handlers/Shims/e_shims.php
+++ b/e107_handlers/Shims/eShims.php
@@ -12,7 +12,7 @@
 // e107 v2-style classes
 namespace
 {
-	class e_shims extends \e107\Shims\All
+	class eShims extends \e107\Shims\All
 	{
 	}
 }
\ No newline at end of file
diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index 74d60343f..28055aefb 100755
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -203,7 +203,6 @@ class e107
 		'e_parse_shortcode'              => '{e_HANDLER}shortcode_handler.php',
 		'e_plugin'                       => '{e_HANDLER}plugin_class.php',
 		'e_ranks'                        => '{e_HANDLER}e_ranks_class.php',
-		'e_shims'                        => '{e_HANDLER}Shims/e_shims.php',
 		'e_shortcode'                    => '{e_HANDLER}shortcode_handler.php',
 		'e_system_user'                  => '{e_HANDLER}user_model.php',
 		'e_theme'                        => '{e_HANDLER}theme_handler.php',
@@ -227,6 +226,7 @@ class e107
 		'eRequest'                       => '{e_HANDLER}application.php',
 		'eResponse'                      => '{e_HANDLER}application.php',
 		'eRouter'                        => '{e_HANDLER}application.php',
+		'eShims'                         => '{e_HANDLER}Shims/eShims.php',
 		'eUrl'                           => '{e_HANDLER}e107Url.php',
 		'eUrlConfig'                     => '{e_HANDLER}application.php',
 		'eUrlRule'                       => '{e_HANDLER}application.php',
diff --git a/e107_handlers/resize_handler.php b/e107_handlers/resize_handler.php
index d550939ec..61685374c 100644
--- a/e107_handlers/resize_handler.php
+++ b/e107_handlers/resize_handler.php
@@ -111,7 +111,7 @@ function resize_image($source_file, $destination_file, $type = "upload", $model
 				{
 					if (($result = mimeFromFilename($source_file)) === FALSE) { return FALSE; }
 					header($result);
-					if (e_shims::readfile($source_file) === FALSE) { return FALSE; }
+					if (eShims::readfile($source_file) === FALSE) { return FALSE; }
 				}
 				else
 				{
diff --git a/thumb.php b/thumb.php
index 1fafa0d81..ea0bd3eba 100755
--- a/thumb.php
+++ b/thumb.php
@@ -350,7 +350,7 @@ class e_thumbpage
 			// Send required headers
 			//$this->sendHeaders($thumbnfo);
 
-			e_shims::readfile($cache_filename);
+			eShims::readfile($cache_filename);
 			//$bench->end()->logResult('thumb.php', $_GET['src'].' - retrieve cache');
 			
 			exit;