Change class name; cleanup