Made function names more consistent