Refactor public property names.