Consistent function naming #130