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

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

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