General clean-up and renaming