When a King marries, his wife becomes his Queen Consort. (It doesn’t work the other way round, a Queen marrying a Prince/or similar)
When Charles married Camilla, she took the title Duchess of Cornwall, he is also Duke of Cornwall, as it was felt disrespectful for her to be Princess of Wales, which she is, because of Diana. It was announced in the fullness of time, when Charles becomes King, Camilla will be known as his Princess Consort. As far as I know, that is still the case.
I for one would be perfectly happy for Camilla to be Queen Consort, as that is what she will be, whatever her official title.
I think when push comes to shove, Charles will go for that also.