Set canonicalNaming as a global config option and turn back on tree polling