Unify some variable naming