more expclict namespaces for toggles
Merge pull request #2746 from dimagi/toggletweak

more expclict namespaces for toggles