Merge "unify variable naming scheme."