Rename variable and constant to prop_var and prop_const