Changed selectors to use new v3 variables.