rename properly