Fixed delete, rename