Cleaning packaging and class name