#20 - Headers now consistent between. All currently defined convention now documented.