clean up function names

removed unnecessary prefixing