Changed class name to be more inline with existing modules.