Minor changes to function name and tests following review.