refactor property names in accordance with bean naming convention