updated annotations to use new maps, and more consistent naming