ccanlint: rename structures to match keys