minor modifications to function names