Updating class names so that autoloader works properly