wip - rename routines to be more consistent with other modules