Merge "Change class and variable names"