Rename properties and refactor array/object constants