Revert to using "name" instead of "names" in function templates