Renamed static final vars that contain property names