second set of renames grid->raster