Autoloader changed to allow underscored names