renaming a few things to be more consistent with module name