[aquamar] renamings