Updated dataview class names to match latest changes