Enhancement #28 complete: Generator name is changed. Also rolled in some fixes for the nav from untested port code