Updates for naming consistency; Better YAML control
Version bump (reflecting compatibility changes)