Rename Grid classes