Updated naming convention for properties