make navigation naming more clear