Clean up some language

Reviewed by:	will