Clean up function naming, remove utf8 mode references