Changed name from Map to Grid