Rename data views for clarity