Rename data variable names and tweak toggle conditional