update strings

Sriram asked us to update strings to be more consistent, so doing that here.

reviewer: @mvrable