Changed class and method names to be more user-friendly