Oops, complete renaming that function. Also remove some exports that seem no longer used.