Changed class name to avoid conflicts