Some clean-up and renaming continued...