Make some labels related to breadcrumbs/location entry a bit more
consistent.  Closes #392