Change variable names and method calls