Add some after-migrate renames
Clean up the capitalization scheme