Changing some names from "Visual" to "Pivot"