Should we edit those includes to match the names In the datasheet?
absolutely not, there is no problem to solve

if you want to use mpasm bit names in your code then use the bit names that microchip have created for them
there is zero point in inventing names that mpasmx will not recognize.
the proper and correct names are in the mpasmx picxxxxx.inc files