Rename models and remove circlegrid