Actually finish renaming this time