clear up some variable name confusion