Changed function names

Makes them more relevant.