refactored navigator class methods name for clarity