Fix rename properly