Changed class and method names