simplify by collecting upgrades immediately
upgrade wording around contracts to use full names instead of abbreviations