[CLC-1695] More foolproof namespace