 
     // MARK: Responding to Annotation Views
 
-    public var rx_mapViewDidAddAnnotationViews: Observable<[MKAnnotationView]!> {
+    public var rx_didAddAnnotationViews: Observable<[MKAnnotationView]!> {
         return rx_delegate.observe("mapView:didAddAnnotationViews:")
             .map { a in
                 return a[1] as? [MKAnnotationView]
         }
     }
 
-    public var rx_mapViewAnnotationViewCalloutAccessoryControlTapped: Observable<Void> {
+    public var rx_annotationViewCalloutAccessoryControlTapped: Observable<Void> {
         return rx_delegate.observe("mapView:annotationView:calloutAccessoryControlTapped:")
             .map { _ in
                 return()


    // MARK: Selecting Annotation Views

    public var rx_mapViewDidSelectAnnotationView: Observable<MKAnnotationView!> {
        return rx_delegate.observe("mapView:didSelectAnnotationView:")
            .map { a in
                return a[1] as? MKAnnotationView
        }
    }

    public var rx_mapViewDidDeselectAnnotationView: Observable<MKAnnotationView!> {
        return rx_delegate.observe("mapView:didDeselectAnnotationView:")
            .map { a in
                return a[1] as? MKAnnotationView
        }
    }

    public var rx_mapViewDidChangeState: Observable<(view: MKAnnotationView!, newState: MKAnnotationViewDragState, oldState: MKAnnotationViewDragState)> {
        return rx_delegate.observe("mapView:annotationView:didChangeDragState:fromOldState:")
            .map { a in
                return (view: a[1] as? MKAnnotationView, newState: a[2] as! MKAnnotationViewDragState, oldState: a[3] as! MKAnnotationViewDragState)


    // MARK: Responding to Rendering Events

    public var rx_willStartRenderingMap: Observable<Void>{
        return rx_delegate.observe("mapViewWillStartRenderingMap:")
            .map { _ in
                return()
        }
    }

    public var rx_didFinishRenderingMap: Observable<Bool!> {
        return rx_delegate.observe("mapViewDidFinishRenderingMap:fullyRendered:")
            .map { a in
                return a[1] as? Bool
