Change some variable and class name