Update subgrid location inversion. More renaming.