Update grid and file naming