diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 1f2d6ddbc1..c158e07092 100644
--- lib/puppet/defaults.rb
+++ lib/puppet/defaults.rb
@@ -76,7 +76,7 @@ UTM
       end
       path.join(File::PATH_SEPARATOR)
     else
-      '$codedir/modules:/opt/puppetlabs/puppet/modules'
+      '$codedir/modules:/usr/share/puppet-modules'
     end
   end
 
diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb
index 36f38ddb0d..6e725c7405 100644
--- lib/puppet/util/run_mode.rb
+++ lib/puppet/util/run_mode.rb
@@ -63,27 +63,27 @@ module Puppet
 
     class UnixRunMode < RunMode
       def conf_dir
-        which_dir("/etc/puppetlabs/puppet", "~/.puppetlabs/etc/puppet")
+        which_dir("/etc/puppet", "~/.puppet/etc")
       end
 
       def code_dir
-        which_dir("/etc/puppetlabs/code", "~/.puppetlabs/etc/code")
+        which_dir("/etc/puppet/code", "~/.puppet/etc/code")
       end
 
       def var_dir
-        which_dir("/opt/puppetlabs/puppet/cache", "~/.puppetlabs/opt/puppet/cache")
+        which_dir("/var/cache/puppet", "~/.puppet/cache")
       end
 
       def public_dir
-        which_dir("/opt/puppetlabs/puppet/public", "~/.puppetlabs/opt/puppet/public")
+        which_dir("/usr/share/puppet/public", "~/.puppet/public")
       end
 
       def run_dir
-        which_dir("/var/run/puppetlabs", "~/.puppetlabs/var/run")
+        which_dir("/run/puppet", "~/.puppet/var/run")
       end
 
       def log_dir
-        which_dir("/var/log/puppetlabs/puppet", "~/.puppetlabs/var/log")
+        which_dir("/var/log/puppet", "~/.puppet/var/log")
       end
     end