Rename properly