Changed function names for more fimiliar ones.