[CLC-1133] More namespace fixes