Address module class name changes from c8f788ad0..HEAD