More automated renaming.