More trimming and renaming.