changed: CommonTypes
 - minor renaming of properties