Renames classes to reflect new module name