Rename constant following the convention
Fix some checkstyle issues