     
     // MARK: addRouteMapping
     
-    public func addRouteMapping(routeMapping: Mapping) -> RouteMappingID
+    public func addRouteMapping(routeMapping: RouteMapping) -> RouteMappingID
     {
         let key = _createUniqueString()
         

    
    public typealias Handler = Context -> ()
    
    public typealias Mapping = (event: E?, fromState: S, userInfo: Any?) -> S?
    
    private var _routes: [_Event<E> : [Transition<S> : [String : Condition?]]] = [:]
    
    private var _routeMappings: [String : Mapping] = [:]
    
    private var _handlers: [Transition<S> : [_HandlerInfo<S, E>]] = [:]
    private var _errorHandlers: [_HandlerInfo<S, E>] = []

    
    // MARK: addRouteMapping + conditional handler
    
    public func addRouteMapping(routeMapping: RouteMapping, handler: Handler) -> (RouteMappingID, HandlerID<S, E>)
    {
        let routeMappingID = self.addRouteMapping(routeMapping)
        
