Switch to new NamingDirectory integeration