DBC 1132 - Implements new namespaces.
DBC-1130 & DBC-1132 conflict fixing.