Update more variables to new naming scheme