changing class, method names