Changing some names and removing a self declaration from a static method.