Rename prop_* functions with better names