MAESTRO-3087 Namespace change, error improvements