Remove module name and underscore class name