Minor rename
Add module helper functions; renames