Aqua del Sol: Latin? Spanish? Mix?

Main Scenario Quest: A Tall Drink of Aqua del Sol

From my point of view and just for consistency's sake, Aqua del Sol should be renamed to Agua del Sol, since Aqua is not the Spanish word for 'water' but its Latin counterpart, and there's already another key item related to this quest (Brazo del Sol) on full Spanish and not a mix of Spanish and Latin.
Note the expression appears not only on the title of the quest, but also on objectives, dialogues, journal and key item.