Properly rename everything