minor: tweak names of geo query helpers to be more consistent