fixing the class names to allow the autoloader to work better