For real, finish renaming