Updating navigation service names to match James' strict rules