 	{	
 		internal static var _logger:ILogger;
 		
-		private var _enterMapping:SegmentMapper = new SegmentMapper( "" );
-		private var _exitMapping:SegmentMapper = new SegmentMapper( "" );
+		private var _enterMapper:SegmentMapper = new SegmentMapper( "" );
+		private var _exitMapper:SegmentMapper = new SegmentMapper( "" );
 		
 		private var _requestedState:NavigationState;
 		

			//TODO: Handle nested request made from guards and hooks
			
			// Store and possibly mask the requested state
			var requested : NavigationState = NavigationState.make(stateOrPath);
			if (requested.hasWildcard()) {
				requested = requested.mask( _currentState );
				if (requested.hasWildcard()){

		 */
		public function Navigator( initialState:* = "/" ) {
			
			_currentState = NavigationState.make( initialState );
			
		}
		
