Changing the class name to fix issues with a few customers