Update angular to use new location helper names for clarity