class name cleanup