update some fuction names to be not terrible.