Consistent _91 naming scheme for reverse compatibility gadgets.
Cleanup and split of unit_attributes.