new naming convention
fixed checkstyle errors