finish renaming madness