applied more consistent nomenclature in navigation