Rename and revise properties