diff --git a/data/common.yaml b/data/common.yaml
index 8469bdd..9bd7013 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -3,7 +3,7 @@ choria::server_config:
   classesfile: "/opt/puppetlabs/puppet/cache/state/classes.txt"
   rpcaudit: 1
   plugin.rpcaudit.logfile: "/var/log/choria-audit.log"
-  plugin.yaml: "/etc/puppetlabs/mcollective/generated-facts.yaml"
+  plugin.yaml: "/etc/choria/generated-facts.yaml"
   plugin.choria.agent_provider.mcorpc.agent_shim: "/usr/bin/choria_mcollective_agent_compat.rb"
   plugin.choria.agent_provider.mcorpc.config: "/etc/choria/choria-shim.cfg"
   plugin.choria.agent_provider.mcorpc.libdir: "/opt/puppetlabs/mcollective/plugins"
diff --git a/data/os/FreeBSD.yaml b/data/os/FreeBSD.yaml
index d341d81..dac0859 100644
--- a/data/os/FreeBSD.yaml
+++ b/data/os/FreeBSD.yaml
@@ -1,7 +1,7 @@
 ---
 choria::server_config:
   classesfile: "/var/puppet/state/classes.txt"
-  plugin.yaml: "/usr/local/etc/mcollective/generated-facts.yaml"
+  plugin.yaml: "/usr/local/etc/choria/generated-facts.yaml"
   plugin.choria.agent_provider.mcorpc.agent_shim: "/usr/local/bin/choria_mcollective_agent_compat.rb"
   plugin.choria.agent_provider.mcorpc.config: "/usr/local/etc/choria/choria-shim.cfg"
   plugin.choria.agent_provider.mcorpc.libdir: "/usr/local/share"