Change error messages and API to match new terminology

[braingram]

See #1953 for the updates and justification for delaying this. I propose that we wait until the next major version to introduce any API/error message changes with suitable deprecations.