diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index 42e98b02e..fc93d457e 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -187,7 +187,7 @@ class e107
 		'e_admin_request'                => '{e_HANDLER}admin_ui.php',
 		'e_admin_response'               => '{e_HANDLER}admin_ui.php',
 		'e_admin_ui'                     => '{e_HANDLER}admin_ui.php',
-		'e_ajax_class'                   => '{e_HANDLER}e_ajax_class.php',
+		'e_ajax' => '{e_HANDLER}e_ajax_class.php',
 		'e_array'                        => '{e_HANDLER}core_functions.php', // Old ArrayStorage.
 		'e_bbcode'                       => '{e_HANDLER}bbcode_handler.php',
 		'e_bb_base'                      => '{e_HANDLER}bbcode_handler.php',
@@ -2046,11 +2046,11 @@ class e107
 	/**
 	 * Retrieve ajax singleton object
 	 *
-	 * @return e_ajax_class
+	 * @return e_ajax
 	 */
 	public static function getAjax()
 	{
-		return self::getSingleton('e_ajax_class', true);
+		return self::getSingleton('e_ajax', true);
 	}
 
 	/**
diff --git a/e107_handlers/e_ajax_class.php b/e107_handlers/e_ajax_class.php
index 39bdfe506..3a2c04882 100644
--- a/e107_handlers/e_ajax_class.php
+++ b/e107_handlers/e_ajax_class.php
@@ -49,7 +49,7 @@
  *   $ajax->response($commands);
  * @endcode
  */
-class e_ajax_class
+class e_ajax
 {
 
 	/**
diff --git a/e107_handlers/e_signup_class.php b/e107_handlers/e_signup_class.php
index b7de01de1..e21127368 100644
--- a/e107_handlers/e_signup_class.php
+++ b/e107_handlers/e_signup_class.php
@@ -17,7 +17,7 @@ if (!defined('e107_INIT')) { exit; }
  * @todo add all processing elements withing signup.php into this class.
  * @todo create unit tests for each of the methods.
  */
-class e_signup_class
+class e_signup
 {
 
 	private $testMode = false;
diff --git a/e107_tests/tests/unit/e_signup_classTest.php b/e107_tests/tests/unit/e_signup_classTest.php
index d4675b5f3..b2dbba355 100644
--- a/e107_tests/tests/unit/e_signup_classTest.php
+++ b/e107_tests/tests/unit/e_signup_classTest.php
@@ -12,7 +12,7 @@
 	class e_signup_classTest extends \Codeception\Test\Unit
 	{
 
-		/** @var e_signup_class */
+		/** @var e_signup */
 		protected $sup;
 
 		protected function _before()
@@ -20,11 +20,11 @@
 			require_once(e_HANDLER."e_signup_class.php");
 			try
 			{
-				$this->sup = $this->make('e_signup_class');
+				$this->sup = $this->make('e_signup');
 			}
 			catch(Exception $e)
 			{
-				$this->assertTrue(false, "Couldn't load e_signup_class object");
+				$this->assertTrue(false, "Couldn't load e_signup object");
 			}
 
 			$this->sup->__construct();
diff --git a/signup.php b/signup.php
index 1bc32d008..c2919d9db 100644
--- a/signup.php
+++ b/signup.php
@@ -132,7 +132,7 @@ require_once(e_HANDLER."e_signup_class.php");
 if(e_QUERY && e_QUERY != 'stage1')
 {
 	require_once(HEADERF);
-	$suObj = new e_signup_class;
+	$suObj = new e_signup;
 	$suObj->run();
 	require_once(FOOTERF);
 	exit;
@@ -508,7 +508,7 @@ if (isset($_POST['register']) && intval($pref['user_reg']) === 1)
 
 			require_once(HEADERF);
 
-			$after_signup = e_signup_class::render_after_signup($error_message);
+			$after_signup = e_signup::render_after_signup($error_message);
 			$ns->tablerender($after_signup['caption'], $after_signup['text']);
 
 			require_once(FOOTERF);