2

Don’t use boundary=administrative for both: reserve that for the actual administrative entity. For the other one use a different boundary=* tag. We have the same issue in the UK (although I think using admin_level=6 for one of those was not the best policy).

An alternative is to add a designation tag to delineate which type of legal entity it is (again we have this in the UK because we have a myriad of confusing administrative entities with different names in different part of the UK).