[FIX] do the renaming properly