fixed to rename properly