Merge "Rename methods to reflect the correct names of nav modes"