Rename mapDirective to mapAnnotation