[#BDKCORE-200] - Fixing namespaces