Update domain messages and text to be more domain centric (rather than namespace)

@liggitt review