Rename namespace (remove underscore).
Tweak error messages.