     }
     
     /**
-     *  @private
-     */ 
-    override protected function registerPersistenceClassAliases():void
-    {
-        super.registerPersistenceClassAliases();
-        
-        // Register aliases for custom classes that will be written to
-        // persistence store by navigator
-        registerClassAlias("ViewDescriptor", ViewDescriptor);
-        registerClassAlias("NavigationStack", NavigationStack);
-    }
-    
-    /**
      * @private
      */
-    override protected function restoreApplicationState():void
+    override protected function loadNavigatorState():void
     {
         // TODO (chiedozi): Figure out how to refactor this into base class.  Need navigator
         // to be a part of the base class
-        super.restoreApplicationState();
+        super.loadNavigatorState();
         
         var savedState:Object = persistenceManager.getProperty("navigatorState");
         
         if (savedState)
-            navigator.restoreViewData(savedState);
+            navigator.loadViewData(savedState);
     }
     
     //--------------------------------------------------------------------------

                newNavigatorProperties.titleLayout = navigator.titleLayout;
               
            // Always want to save the navigation stack
            // TODO (chiedozi): I'm not doing this right...
            newNavigatorProperties.navigationStack = navigator.navigationStack;
            navigatorProperties = newNavigatorProperties;
        }

    /**
     *  @private
     */ 
    override protected function deactivateHandler(event:Event):void
    {
        if (navigator && navigator.activeView)
            navigator.activeView.setActive(false);

        // super is called after so that the active view can get the
        // viewDeactive event before the persistence process begins.
        super.deactivateHandler(event);
    }
    
    /**
     *  @private
     */ 
    override protected function backKeyUpHandler(event:KeyboardEvent):void
    {
        super.backKeyUpHandler(event);
        
        if (viewMenuOpen)
            viewMenuOpen = false;
        else
            navigator.backKeyUpHandler();
    }
    
    /**
     *  @private
     */ 
    override protected function saveNavigatorState():void
    {
        super.saveNavigatorState();

        // TODO (chiedozi): Rename save to maybe get?
        if (navigator)
