Fixed Renaming amongst other things