This was done have some alignment with the corresponding api methods as well as matching standard Go conventions.