Merge "Make sure GRID_NAME is updated every time it changes." into main