Provided implementers are on board with whatwg/html#3499 as a way of fixing whatwg/html#83 (comment), the mappings for these elements will need to change as well. This should be rather easy to do for these elements on top of the "heading level" concept they will get once that PR lands.

I figured I'd raise this somewhat early so a) we don't forget about it and b) I might be able to get more feedback this way.