minor revision to fn names for consistency across modules