Simplified scala class name cleanup.