Updated a couple utility function names