Some tidy up, including renaming of most of our Types
Some renaming