grand renaming to 'aqua' (well, 'Aqua' actually)