Fix to cleanup CGLIB class names