class rename and checkstyle fix