Modified naming conventions so functions are more consistent with endpoints