changed fn names in sync w refactored names in main module