Error message type hierarchy plus renamed some things for consistency across OF versions

Reviewer: @andi-bigswitch @rlane