Merge "Change local names for greater clarity." into honeycomb