Seems like this issue occurred during the very first integration of NAACCR into the OMOP vocabs.
Currently, NAACCR is out of the roadmap and the Vocabulary team does not plan any improvement in it. However, you can talk to the Oncology WG and implement these fixes as a part of the Community Contribution.