Make naming consistent with other locations.