Fix everything for the rename