Change class and variable names