Changed a few function names for consistancy