CONN-1164

Namespace changes, added constants for use in sub-tickets.