Correct. They painted themselves into a corner with that... They needed a kindergartener, because it was a kid's movie... like a Home Alone in space... but they also needed a future love interest for said kindergartener, so she had to be really young... but she also had to be important enough to justify Jedi bodyguards and also be a "leader" bossing people around... which only makes sense if she's royalty. But then if Anakin is marrying "the Queen" that makes Luke a Prince which wasn't the case. It also makes Anakin the King, which also wasn't the case, so she needed to be freed from her royal mantle somehow to maintain continuity. Plus they wanted her to be going on missions with Anakin without all her royal attendants which would have been impossible for a Queen to do. they also wanted her out of those gigantic ceremonial robes with all the elaborate head-dress and clown facepaint, in favor of things more alluring... also impossible with her remaining as Queen... so they just handwaived "Queen" into a temporary elected office... the requirement of which apparently is that you must be no older than 17 to hold... so I guess she aged out of the Queenship and had to run for "Senator" instead... preposterous.