These could have better names.

Now that there's a external developer-defined namespace as well as our `goinstant` namespace, these should have accurate names in the code.