initial migration cleanup and renames