Update language to be closer to what experienced developers would expect

To make the transition easier, this version re-uses existing language as
far as possible.