Some function names were inadequate. Fixed.
Some function names were inadequate. Fixed.

mangalam-research/salve,lddubeau/salve,mangalam-research/salve,lddubeau/salve,lddubeau/salve,mangalam-research/salve