Final pass at renaming.