Fix for checkstyle warnings after class renames and other changes