Change packages and method names