Renamed all references to Reductive Labs to Puppet Labs

57 files changed, 108 insertions, 108 deletions

diff --git a/LICENSE b/LICENSE
index 57d96f83e..a43a24352 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
-Puppet - Automating Configuration Management. Copyright (C) 2005 Reductive Labs LLC
+Puppet - Automating Configuration Management. Copyright (C) 2005 Puppet Labs LLC
 
-Reductive Labs can be contacted at: info@reductivelabs.com
+Puppet Labs can be contacted at: info@puppetlabs.com
 
 This program and entire repository is free software; you can
 redistribute it and/or modify it under the terms of the GNU
diff --git a/README b/README
index 7b6a3afe8..8b1684497 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 Documentation (and detailed install instructions) can be found
-online at http://reductivelabs.com/trac/puppet/wiki/DocumentationStart .
+online at http://puppetlabs.com/trac/puppet/wiki/DocumentationStart .
 
 Generally, you need the following things installed:
 
@@ -22,6 +22,6 @@ Generally, you need the following things installed:
   the library.
 
 * Facter => 1.5.1
-  You can get this from < http://reductivelabs.com/projects/facter >
+  You can get this from < http://puppetlabs.com/projects/facter >
 
 $Id$
diff --git a/README.queueing b/README.queueing
index 8c4a18029..e8be38a80 100644
--- a/README.queueing
+++ b/README.queueing
@@ -8,7 +8,7 @@ Queue Daemon).
 Currently this is only supported for "Storeconfigs" which is
 documented at:
 
-http://reductivelabs.com/trac/puppet/wiki/UsingStoredConfiguration
+http://puppetlabs.com/trac/puppet/wiki/UsingStoredConfiguration
 
 In the future this feature can be extended to any new puppet
 data which involves storage in a database.
diff --git a/README.rst b/README.rst
index 7e34d0d2a..f03621be0 100644
--- a/README.rst
+++ b/README.rst
@@ -34,5 +34,5 @@ Generally, you need the following things installed:
 * Facter => 1.1.1
   You can get this from your package management system or the `Facter site`_
 
-.. _Puppet Wiki: http://reductivelabs.com/trac/puppet/wiki/DocumentationStart
-.. _Facter site: http://reductivelabs.com/projects/facter
+.. _Puppet Wiki: http://puppetlabs.com/trac/puppet/wiki/DocumentationStart
+.. _Facter site: http://puppetlabs.com/projects/facter
diff --git a/bin/filebucket b/bin/filebucket
index 1c5daa4e3..2aa02ff2d 100755
--- a/bin/filebucket
+++ b/bin/filebucket
@@ -53,7 +53,7 @@
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
+# http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppet with
 # '--genconfig'.
@@ -91,7 +91,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'puppet/application'
diff --git a/bin/pi b/bin/pi
index c1a59631e..4f29a2905 100755
--- a/bin/pi
+++ b/bin/pi
@@ -42,7 +42,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'puppet/application/pi'
diff --git a/bin/puppet b/bin/puppet
index 931e3a993..426d647b6 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -23,7 +23,7 @@
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
+# http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppet with
 # '--genconfig'.
@@ -64,7 +64,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'puppet/application/puppet'
diff --git a/bin/puppetdoc b/bin/puppetdoc
index a69d169c9..a20417e64 100755
--- a/bin/puppetdoc
+++ b/bin/puppetdoc
@@ -3,7 +3,7 @@
 #
 # = Synopsis
 #
-# Generate a reference for all Puppet types.  Largely meant for internal Reductive
+# Generate a reference for all Puppet types.  Largely meant for internal Puppet
 # Labs use.
 #
 # = Usage
@@ -16,7 +16,7 @@
 # If mode is not 'rdoc', then this command generates a restructured-text document describing all installed
 # Puppet types or all allowable arguments to puppet executables.  It is largely
 # meant for internal use and is used to generate the reference document
-# available on the Reductive Labs web site.
+# available on the Puppet Labs web site.
 #
 # In 'rdoc' mode, this command generates an html RDoc hierarchy describing the manifests that
 # are in 'manifestdir' and 'modulepath' configuration directives.
@@ -37,7 +37,7 @@
 #   Specifies the directory where to output the rdoc documentation in 'rdoc' mode.
 #
 # mode::
-#   Determine the output mode.  Valid modes are 'text', 'trac', 'pdf', 'markdown' and 'rdoc'. The 'pdf' and 'markdown' modes create PDF or Markdown formatted files in the /tmp directory. Note that 'trac' mode only works on Reductive Labs servers.  The default mode is 'text'.  In 'rdoc' mode you must provide 'manifests-path'
+#   Determine the output mode.  Valid modes are 'text', 'trac', 'pdf', 'markdown' and 'rdoc'. The 'pdf' and 'markdown' modes create PDF or Markdown formatted files in the /tmp directory. Note that 'trac' mode only works on Puppet Labs servers.  The default mode is 'text'.  In 'rdoc' mode you must provide 'manifests-path'
 #
 # reference::
 #   Build a particular reference.  Get a list of references by running +puppetdoc --list+.
@@ -58,7 +58,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005-2007 Reductive Labs, LLC
+# Copyright (c) 2005-2007 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'puppet/application/puppetdoc'
diff --git a/bin/ralsh b/bin/ralsh
index ca20c4c2f..409d3dc69 100755
--- a/bin/ralsh
+++ b/bin/ralsh
@@ -33,7 +33,7 @@
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
+# http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppet with
 # '--genconfig'.
@@ -82,7 +82,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005-2007 Reductive Labs, LLC
+# Copyright (c) 2005-2007 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'puppet/application/ralsh'
diff --git a/conf/epm.list b/conf/epm.list
index d7d7b40e5..efb740774 100644
--- a/conf/epm.list
+++ b/conf/epm.list
@@ -1,6 +1,6 @@
 %product Puppet
-%copyright 2004-2005 by Reductive Labs, All Rights Reserved
-%vendor Reductive Labs
+%copyright 2004-2005 by Puppet Labs, All Rights Reserved
+%vendor Puppet Labs
 %license COPYING
 %readme README
 %description System Automation and Configuration Management Software
diff --git a/conf/osx/PackageInfo.plist b/conf/osx/PackageInfo.plist
index 08930e1ab..947aabb4c 100644
--- a/conf/osx/PackageInfo.plist
+++ b/conf/osx/PackageInfo.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
     <key>CFBundleIdentifier</key>
-    <string>com.reductivelabs.puppet</string>
+    <string>com.puppetlabs.puppet</string>
     <key>CFBundleShortVersionString</key>
     <string>{SHORTVERSION}</string>
     <key>IFMajorVersion</key>
diff --git a/conf/redhat/puppet.spec b/conf/redhat/puppet.spec
index aaebd5188..3c22e8abe 100644
--- a/conf/redhat/puppet.spec
+++ b/conf/redhat/puppet.spec
@@ -9,8 +9,8 @@ Version:        0.25.2
 Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2+
-URL:            http://puppet.reductivelabs.com/
-Source0:        http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tar.gz
+URL:            http://puppet.puppetlabs.com/
+Source0:        http://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz
 Patch0:         rundir-perms.patch
 Group:          System Environment/Base
 
diff --git a/conf/solaris/pkginfo b/conf/solaris/pkginfo
index 7f7bb9736..d3762ba5d 100644
--- a/conf/solaris/pkginfo
+++ b/conf/solaris/pkginfo
@@ -2,6 +2,6 @@ PKG=CSWpuppet
 NAME=puppet - System Automation Framework
 VERSION=0.23.0
 CATEGORY=application
-VENDOR=http://reductivelabs.com/projects/puppet
-HOTLINE=http://reductivelabs.com/cgi-bin/puppet.cgi
+VENDOR=http://puppetlabs.com/projects/puppet
+HOTLINE=http://puppetlabs.com/cgi-bin/puppet.cgi
 EMAIL=luke@madstop.com
diff --git a/conf/solaris/smf/puppetd.xml b/conf/solaris/smf/puppetd.xml
index 84ee0087d..dc4ac2ec0 100644
--- a/conf/solaris/smf/puppetd.xml
+++ b/conf/solaris/smf/puppetd.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 
-<!-- Puppetd Manifest: Luke Kanies - reductivelabs.com -->
+<!-- Puppetd Manifest: Luke Kanies - puppetlabs.com -->
 
 <service_bundle type='manifest' name='puppetd'>
 
@@ -68,8 +68,8 @@
         </common_name>
         <documentation>
             <manpage title='puppetd' section='1' />
-            <doc_link name='reductivelabs.com'
-                uri='http://www.reductivelabs.com/projects/puppet' />
+            <doc_link name='puppetlabs.com'
+                uri='http://www.puppetlabs.com/projects/puppet' />
         </documentation>
     </template>
 </service>
diff --git a/conf/solaris/smf/puppetmasterd.xml b/conf/solaris/smf/puppetmasterd.xml
index e7b0113bd..c0a82f3a3 100644
--- a/conf/solaris/smf/puppetmasterd.xml
+++ b/conf/solaris/smf/puppetmasterd.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 
-<!-- PuppetMasterd Manifest: Luke Kanies - reductivelabs.com -->
+<!-- PuppetMasterd Manifest: Luke Kanies - puppetlabs.com -->
 
 <service_bundle type='manifest' name='puppetmasterd'>
 
@@ -68,8 +68,8 @@
         </common_name>
         <documentation>
             <manpage title='puppetmasterd' section='1' />
-            <doc_link name='reductivelabs.com'
-                uri='http://www.reductivelabs.com/projects/puppet' />
+            <doc_link name='puppetlabs.com'
+                uri='http://www.puppetlabs.com/projects/puppet' />
         </documentation>
     </template>
 </service>
diff --git a/conf/suse/puppet.spec b/conf/suse/puppet.spec
index 15a9b9e5b..9b2f7a34a 100644
--- a/conf/suse/puppet.spec
+++ b/conf/suse/puppet.spec
@@ -10,8 +10,8 @@ Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 
-URL: http://reductivelabs.com/projects/puppet/
-Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tar.gz
+URL: http://puppetlabs.com/projects/puppet/
+Source: http://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz
 Patch0: puppet.suse.patch
 Requires: ruby >= 1.8.2
 Requires: facter >= 1.3.7
diff --git a/examples/modules/sample-module/README.txt b/examples/modules/sample-module/README.txt
index ee4b8201a..579fe60f9 100644
--- a/examples/modules/sample-module/README.txt
+++ b/examples/modules/sample-module/README.txt
@@ -12,6 +12,6 @@ templates/sample.erb
 Note the consistent naming of files for Puppet::Util::Autoload
 
 Reference Documents:
-http://reductivelabs.com/trac/puppet/wiki/ModuleOrganisation
-http://reductivelabs.com/trac/puppet/wiki/WritingYourOwnFunctions
-http://reductivelabs.com/trac/puppet/wiki/FunctionReference
+http://puppetlabs.com/trac/puppet/wiki/ModuleOrganisation
+http://puppetlabs.com/trac/puppet/wiki/WritingYourOwnFunctions
+http://puppetlabs.com/trac/puppet/wiki/FunctionReference
diff --git a/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb b/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb
index d7ad7d22e..e507462c6 100644
--- a/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb
+++ b/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb
@@ -27,7 +27,7 @@
 
 # Jeff McCune <jeff.mccune@northstarlabs.net>
 # 2007-08-14
-# See: http://reductivelabs.com/trac/puppet/wiki/WritingYourOwnFunctions
+# See: http://puppetlabs.com/trac/puppet/wiki/WritingYourOwnFunctions
 
 module Puppet::Parser::Functions
     newfunction(:hostname_to_dn, :type => :rvalue, :doc => "Given 'foo.bar.com', return 'dc=foo,dc=bar,dc=com'.") do |args|
diff --git a/ext/extlookup.rb b/ext/extlookup.rb
index b0978ef12..4793cba7d 100644
--- a/ext/extlookup.rb
+++ b/ext/extlookup.rb
@@ -74,7 +74,7 @@
 # need to edit a load of manifests to do simple things like adjust a desired version number.
 #
 # For more information on installing and writing your own custom functions see:
-#    http://reductivelabs.com/trac/puppet/wiki/WritingYourOwnFunctions
+#    http://puppetlabs.com/trac/puppet/wiki/WritingYourOwnFunctions
 #
 # For further help contact Volcane on #puppet
 require 'csv'
diff --git a/ext/nagios/naggen b/ext/nagios/naggen
index 6ff09e260..2b8480eca 100755
--- a/ext/nagios/naggen
+++ b/ext/nagios/naggen
@@ -29,7 +29,7 @@
 # just like any other executable.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/projects/puppet/reference/configref.html for
+# http://puppetlabs.com/projects/puppet/reference/configref.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppet with
 # '--genconfig'.
@@ -63,7 +63,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2009 Reductive Labs, LLC
+# Copyright (c) 2009 Puppet Labs, LLC
 # Licensed under the GPL 2
 
 require 'puppet'
diff --git a/ext/puppet-test b/ext/puppet-test
index dbbde40c6..d1f49d6d8 100755
--- a/ext/puppet-test
+++ b/ext/puppet-test
@@ -23,7 +23,7 @@
 # parameter, so you can specify '--server <servername>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/projects/puppet/reference/configref.html for
+# http://puppetlabs.com/projects/puppet/reference/configref.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration $options can also be generated by running puppetd with
 # '--genconfig'.
@@ -90,7 +90,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005, 2006 Reductive Labs, LLC
+# Copyright (c) 2005, 2006 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 # Do an initial trap, so that cancels don't get a stack trace.
diff --git a/ext/puppetstoredconfigclean.rb b/ext/puppetstoredconfigclean.rb
index 439d74376..6538192dd 100644
--- a/ext/puppetstoredconfigclean.rb
+++ b/ext/puppetstoredconfigclean.rb
@@ -3,7 +3,7 @@
 # Script to clean up stored configs for (a) given host(s)
 #
 # Credits:
-# Script was taken from http://reductivelabs.com/trac/puppet/attachment/wiki/UsingStoredConfiguration/kill_node_in_storedconfigs_db.rb
+# Script was taken from http://puppetlabs.com/trac/puppet/attachment/wiki/UsingStoredConfiguration/kill_node_in_storedconfigs_db.rb
 # which haven been initially posted by James Turnbull
 # duritong adapted and improved the script a bit.
 
diff --git a/ext/regexp_nodes/regexp_nodes.rb b/ext/regexp_nodes/regexp_nodes.rb
index a9e7ed6a9..78e4357d6 100644
--- a/ext/regexp_nodes/regexp_nodes.rb
+++ b/ext/regexp_nodes/regexp_nodes.rb
@@ -2,7 +2,7 @@
 
 # = Synopsis
 # This is an external node classifier script, after
-# http://reductivelabs.com/trac/puppet/wiki/ExternalNodes
+# http://puppetlabs.com/trac/puppet/wiki/ExternalNodes
 #
 # = Usage
 # regexp_nodes.rb <host>
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index e78b20fe2..d33353585 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -450,12 +450,12 @@ module Puppet
             directories.", :type => :setting }, # We don't want this to be considered a file, since it's multiple files.
         :ssl_client_header => ["HTTP_X_CLIENT_DN", "The header containing an authenticated
             client's SSL DN.  Only used with Mongrel.  This header must be set by the proxy
-            to the authenticated client's SSL DN (e.g., ``/CN=puppet.reductivelabs.com``).
-            See http://reductivelabs.com/puppet/trac/wiki/UsingMongrel for more information."],
+            to the authenticated client's SSL DN (e.g., ``/CN=puppet.puppetlabs.com``).
+            See http://puppetlabs.com/puppet/trac/wiki/UsingMongrel for more information."],
         :ssl_client_verify_header => ["HTTP_X_CLIENT_VERIFY", "The header containing the status
             message of the client verification. Only used with Mongrel.  This header must be set by the proxy
             to 'SUCCESS' if the client successfully authenticated, and anything else otherwise.
-            See http://reductivelabs.com/puppet/trac/wiki/UsingMongrel for more information."],
+            See http://puppetlabs.com/puppet/trac/wiki/UsingMongrel for more information."],
         # To make sure this directory is created before we try to use it on the server, we need
         # it to be in the server section (#1138).
         :yamldir => {:default => "$vardir/yaml", :owner => "service", :group => "service", :mode => "750",
@@ -727,7 +727,7 @@ module Puppet
     setdefaults(:ldap,
         :ldapnodes => [false,
             "Whether to search for node configurations in LDAP.  See
-            http://reductivelabs.com/trac/puppet/wiki/LDAPNodes for more information."],
+            http://puppetlabs.com/trac/puppet/wiki/LDAPNodes for more information."],
         :ldapssl => [false,
             "Whether SSL should be used when searching for nodes.
             Defaults to false because SSL usually requires certificates
diff --git a/lib/puppet/network/authstore.rb b/lib/puppet/network/authstore.rb
index a7029a0a0..d5ba3ef78 100755
--- a/lib/puppet/network/authstore.rb
+++ b/lib/puppet/network/authstore.rb
@@ -183,9 +183,9 @@ module Puppet
 
             # interpolate a pattern to replace any
             # backreferences by the given match
-            # for instance if our pattern is $1.reductivelabs.com
+            # for instance if our pattern is $1.puppetlabs.com
             # and we're called with a MatchData whose capture 1 is puppet
-            # we'll return a pattern of puppet.reductivelabs.com
+            # we'll return a pattern of puppet.puppetlabs.com
             def interpolate(match)
                 clone = dup
                 clone.pattern = clone.pattern.reverse.collect do |p|
@@ -242,7 +242,7 @@ module Puppet
                 when /^\*(\.(\w[-\w]*)){1,}$/                             # *.domain.com
                     host_sans_star = munge_name(value)[0..-2]
                     [:domain,:inexact,host_sans_star.length,host_sans_star]
-                when /\$\d+/                                              # a backreference pattern ala $1.reductivelabs.com or 192.168.0.$1 or $1.$2
+                when /\$\d+/                                              # a backreference pattern ala $1.puppetlabs.com or 192.168.0.$1 or $1.$2
                     [:dynamic,:exact,nil,munge_name(value)]
                 when /^\w[-.@\w]*$/                                       # ? Just like a host name but allow '@'s and ending '.'s
                     [:opaque,:exact,nil,[value]]
diff --git a/lib/puppet/provider/macauthorization/macauthorization.rb b/lib/puppet/provider/macauthorization/macauthorization.rb
index d1e2b229f..bc2dfb176 100644
--- a/lib/puppet/provider/macauthorization/macauthorization.rb
+++ b/lib/puppet/provider/macauthorization/macauthorization.rb
@@ -15,7 +15,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
     confine :operatingsystem => :darwin
 
     # This should be confined based on macosx_productversion once
-    # http://projects.reductivelabs.com/issues/show/1796
+    # http://projects.puppetlabs.com/issues/show/1796
     # is resolved.
     if FileTest.exists?("/usr/bin/sw_vers")
         product_version = sw_vers "-productVersion"
diff --git a/lib/puppet/provider/service/debian.rb b/lib/puppet/provider/service/debian.rb
index 51fb7a22b..1f9dc5ab6 100755
--- a/lib/puppet/provider/service/debian.rb
+++ b/lib/puppet/provider/service/debian.rb
@@ -10,7 +10,7 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
 
     commands :update_rc => "/usr/sbin/update-rc.d"
     # note this isn't being used as a command until
-    # http://projects.reductivelabs.com/issues/2538
+    # http://projects.puppetlabs.com/issues/2538
     # is resolved.
     commands :invoke_rc => "/usr/sbin/invoke-rc.d"
     
@@ -28,7 +28,7 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
 
     def enabled?
         # TODO: Replace system() call when Puppet::Util.execute gives us a way
-        # to determine exit status.  http://projects.reductivelabs.com/issues/2538
+        # to determine exit status.  http://projects.puppetlabs.com/issues/2538
         system("/usr/sbin/invoke-rc.d", "--quiet", "--query", @resource[:name], "start")
         
         # 104 is the exit status when you query start an enabled service.
diff --git a/lib/puppet/reference/providers.rb b/lib/puppet/reference/providers.rb
index d425d803e..884e34f7e 100644
--- a/lib/puppet/reference/providers.rb
+++ b/lib/puppet/reference/providers.rb
@@ -96,7 +96,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
 
         ret += h(type.name.to_s + "_", 2)
 
-        ret += ".. _%s: %s\n\n" % [type.name, "http://reductivelabs.com/trac/puppet/wiki/TypeReference#%s" % type.name]
+        ret += ".. _%s: %s\n\n" % [type.name, "http://puppetlabs.com/trac/puppet/wiki/TypeReference#%s" % type.name]
         ret += option("Default provider", default)
         ret += doctable(headers, table_data)
 
diff --git a/lib/puppet/type/exec.rb b/lib/puppet/type/exec.rb
index a68bfb189..64b6f2d39 100755
--- a/lib/puppet/type/exec.rb
+++ b/lib/puppet/type/exec.rb
@@ -52,7 +52,7 @@ module Puppet
             in the short term, it is highly recommended to migrate work from ``exec``
             to native Puppet types as quickly as possible.  If you find that
             you are doing a lot of work with ``exec``, please at least notify
-            us at Reductive Labs what you are doing, and hopefully we can work with
+            us at Puppet Labs what you are doing, and hopefully we can work with
             you to get a native resource type for the work you are doing."
 
         require 'open3'
diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb
index fdb5a3578..0aaad3e97 100644
--- a/lib/puppet/type/file.rb
+++ b/lib/puppet/type/file.rb
@@ -22,7 +22,7 @@ module Puppet
 
             If you find that you are often copying files in from a central
             location, rather than using native resources, please contact
-            Reductive Labs and we can hopefully work with you to develop a
+            Puppet Labs and we can hopefully work with you to develop a
             native resource to support what you are doing."
 
         newparam(:path) do
diff --git a/lib/puppet/util/nagios_maker.rb b/lib/puppet/util/nagios_maker.rb
index 339d2d1a2..d7044f2c8 100644
--- a/lib/puppet/util/nagios_maker.rb
+++ b/lib/puppet/util/nagios_maker.rb
@@ -55,7 +55,7 @@ module Puppet::Util::NagiosMaker
             You can purge Nagios resources using the ``resources`` type, but *only*
             in the default file locations.  This is an architectural limitation.
 
-            .. _naginator: http://projects.reductivelabs.com/projects/naginator
+            .. _naginator: http://projects.puppetlabs.com/projects/naginator
         "
     end
 end
diff --git a/man/man5/puppet.conf.5 b/man/man5/puppet.conf.5
index 6bff15afc..ff9b88953 100644
--- a/man/man5/puppet.conf.5
+++ b/man/man5/puppet.conf.5
@@ -738,7 +738,7 @@ The LDAP attributes to use to define Puppet classes.  Values should be comma\-se
 .UNINDENT
 .SS ldapnodes
 .sp
-Whether to search for node configurations in LDAP.  See \fI\%http://reductivelabs.com/trac/puppet/wiki/LDAPNodes\fP for more information.
+Whether to search for node configurations in LDAP.  See \fI\%http://puppetlabs.com/trac/puppet/wiki/LDAPNodes\fP for more information.
 .INDENT 0.0
 .IP \(bu 2
 .
@@ -1310,7 +1310,7 @@ The maximum time to delay before runs.  Defaults to being the same as the run in
 .UNINDENT
 .SS ssl_client_header
 .sp
-The header containing an authenticated client\(aqs SSL DN.  Only used with Mongrel.  This header must be set by the proxy to the authenticated client\(aqs SSL DN (e.g., \fB/CN=puppet.reductivelabs.com\fP). See \fI\%http://reductivelabs.com/puppet/trac/wiki/UsingMongrel\fP for more information.
+The header containing an authenticated client\(aqs SSL DN.  Only used with Mongrel.  This header must be set by the proxy to the authenticated client\(aqs SSL DN (e.g., \fB/CN=puppet.puppetlabs.com\fP). See \fI\%http://puppetlabs.com/puppet/trac/wiki/UsingMongrel\fP for more information.
 .INDENT 0.0
 .IP \(bu 2
 .
@@ -1318,7 +1318,7 @@ The header containing an authenticated client\(aqs SSL DN.  Only used with Mongr
 .UNINDENT
 .SS ssl_client_verify_header
 .sp
-The header containing the status message of the client verification. Only used with Mongrel.  This header must be set by the proxy to \(aqSUCCESS\(aq if the client successfully authenticated, and anything else otherwise. See \fI\%http://reductivelabs.com/puppet/trac/wiki/UsingMongrel\fP for more information.
+The header containing the status message of the client verification. Only used with Mongrel.  This header must be set by the proxy to \(aqSUCCESS\(aq if the client successfully authenticated, and anything else otherwise. See \fI\%http://puppetlabs.com/puppet/trac/wiki/UsingMongrel\fP for more information.
 .INDENT 0.0
 .IP \(bu 2
 .
diff --git a/man/man8/filebucket.8 b/man/man8/filebucket.8
index de2dee733..4421ad137 100644
--- a/man/man8/filebucket.8
+++ b/man/man8/filebucket.8
@@ -64,7 +64,7 @@ configuration parameter, so you can specify \(aq\-\-ssldir <directory>\(aq as an
 argument.
 .sp
 See the configuration file documentation at
-\fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
+\fI\%http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
 \(aq\-\-genconfig\(aq.
@@ -100,7 +100,7 @@ filebucket \-b /tmp/filebucket /my/file
 Luke Kanies
 .SH COPYRIGHT
 .sp
-Copyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public
+Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public
 License
 .\" Generated by docutils manpage writer.
 .\" 
diff --git a/man/man8/pi.8 b/man/man8/pi.8
index 519be2ca9..cb57dc389 100644
--- a/man/man8/pi.8
+++ b/man/man8/pi.8
@@ -43,7 +43,7 @@ pi user \-s \-m
 David Lutterkort
 .SH COPYRIGHT
 .sp
-Copyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public
+Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public
 License
 .\" Generated by docutils manpage writer.
 .\" 
diff --git a/man/man8/puppet.8 b/man/man8/puppet.8
index 02176ce81..ede96be20 100644
--- a/man/man8/puppet.8
+++ b/man/man8/puppet.8
@@ -30,7 +30,7 @@ configuration parameter, so you can specify \(aq\-\-ssldir <directory>\(aq as an
 argument.
 .sp
 See the configuration file documentation at
-\fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
+\fI\%http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
 \(aq\-\-genconfig\(aq.
@@ -75,7 +75,7 @@ puppet \-l /tmp/manifest.log manifest.pp
 Luke Kanies
 .SH COPYRIGHT
 .sp
-Copyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public
+Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public
 License
 .\" Generated by docutils manpage writer.
 .\" 
diff --git a/man/man8/puppetca.8 b/man/man8/puppetca.8
index 92e9de1b1..a94ea03a1 100644
--- a/man/man8/puppetca.8
+++ b/man/man8/puppetca.8
@@ -33,7 +33,7 @@ configuration parameter, so you can specify \(aq\-\-ssldir <directory>\(aq as an
 argument.
 .sp
 See the configuration file documentation at
-\fI\%http://reductivelabs.com/projects/puppet/reference/configref.html\fP for
+\fI\%http://puppetlabs.com/projects/puppet/reference/configref.html\fP for
 the full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppetca with
 \(aq\-\-genconfig\(aq.
@@ -108,7 +108,7 @@ $ puppetca \-s culain.madstop.com
 Luke Kanies
 .SH COPYRIGHT
 .sp
-Copyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public
+Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public
 License
 .\" Generated by docutils manpage writer.
 .\" 
diff --git a/man/man8/puppetd.8 b/man/man8/puppetd.8
index c2d5cb530..ed40fff78 100644
--- a/man/man8/puppetd.8
+++ b/man/man8/puppetd.8
@@ -66,7 +66,7 @@ configuration parameter, so you can specify \(aq\-\-server <servername>\(aq as
 an argument.
 .sp
 See the configuration file documentation at
-\fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
+\fI\%http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppetd with
 \(aq\-\-genconfig\(aq.
@@ -178,7 +178,7 @@ puppetd \-\-server puppet.domain.com
 Luke Kanies
 .SH COPYRIGHT
 .sp
-Copyright (c) 2005, 2006 Reductive Labs, LLC Licensed under the GNU
+Copyright (c) 2005, 2006 Puppet Labs, LLC Licensed under the GNU
 Public License
 .\" Generated by docutils manpage writer.
 .\" 
diff --git a/man/man8/puppetdoc.8 b/man/man8/puppetdoc.8
index 5cf7269f0..cf64a7bff 100644
--- a/man/man8/puppetdoc.8
+++ b/man/man8/puppetdoc.8
@@ -6,7 +6,7 @@
 .SH SYNOPSIS
 .sp
 Generate a reference for all Puppet types. Largely meant for internal
-Reductive Labs use.
+Puppet Labs use.
 .SH USAGE
 .INDENT 0.0
 .INDENT 3.5
@@ -24,7 +24,7 @@ If mode is not \(aqrdoc\(aq, then this command generates a restructured\-text
 document describing all installed Puppet types or all allowable
 arguments to puppet executables. It is largely meant for internal use
 and is used to generate the reference document available on the
-Reductive Labs web site.
+Puppet Labs web site.
 .sp
 In \(aqrdoc\(aq mode, this command generates an html RDoc hierarchy describing
 the manifests that are in \(aqmanifestdir\(aq and \(aqmodulepath\(aq configuration
@@ -53,7 +53,7 @@ documentation in \(aqrdoc\(aq mode.
 .
 \(aqpdf\(aq, \(aqmarkdown\(aq and \(aqrdoc\(aq. The \(aqpdf\(aq and \(aqmarkdown\(aq modes
 create PDF or Markdown formatted files in the /tmp directory.
-Note that \(aqtrac\(aq mode only works on Reductive Labs servers.
+Note that \(aqtrac\(aq mode only works on Puppet Labs servers.
 The default mode is \(aqtext\(aq. In \(aqrdoc\(aq mode you must provide
 \(aqmanifests\-path\(aq
 .TP
@@ -97,7 +97,7 @@ $ puppetdoc \-m markdown \-r configuration
 Luke Kanies
 .SH COPYRIGHT
 .sp
-Copyright (c) 2005\-2007 Reductive Labs, LLC Licensed under the GNU
+Copyright (c) 2005\-2007 Puppet Labs, LLC Licensed under the GNU
 Public License
 .\" Generated by docutils manpage writer.
 .\" 
diff --git a/man/man8/puppetmasterd.8 b/man/man8/puppetmasterd.8
index 5bfea2ef2..17652fbd3 100644
--- a/man/man8/puppetmasterd.8
+++ b/man/man8/puppetmasterd.8
@@ -29,7 +29,7 @@ configuration parameter, so you can specify \(aq\-\-ssldir <directory>\(aq as an
 argument.
 .sp
 See the configuration file documentation at
-\fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
+\fI\%http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppetmasterdd
 with \(aq\-\-genconfig\(aq.
@@ -65,7 +65,7 @@ puppetmasterd
 Luke Kanies
 .SH COPYRIGHT
 .sp
-Copyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public
+Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public
 License
 .\" Generated by docutils manpage writer.
 .\" 
diff --git a/man/man8/puppetqd.8 b/man/man8/puppetqd.8
index bf08f2bb2..14e9915ef 100644
--- a/man/man8/puppetqd.8
+++ b/man/man8/puppetqd.8
@@ -24,7 +24,7 @@ configuration parameter, so you can specify \(aq\-\-server <servername>\(aq as
 an argument.
 .sp
 See the configuration file documentation at
-\fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
+\fI\%http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppetd with
 \(aq\-\-genconfig\(aq.
@@ -48,7 +48,7 @@ puppetqd
 Luke Kanies
 .SH COPYRIGHT
 .sp
-Copyright (c) 2009 Reductive Labs, LLC Licensed under the GNU Public
+Copyright (c) 2009 Puppet Labs, LLC Licensed under the GNU Public
 License
 .\" Generated by docutils manpage writer.
 .\" 
diff --git a/man/man8/puppetrun.8 b/man/man8/puppetrun.8
index 73a4ba3f2..c0116fdf7 100644
--- a/man/man8/puppetrun.8
+++ b/man/man8/puppetrun.8
@@ -74,7 +74,7 @@ configuration parameter, so you can specify \(aq\-\-ssldir <directory>\(aq as an
 argument.
 .sp
 See the configuration file documentation at
-\fI\%http://reductivelabs.com/projects/puppet/reference/configref.html\fP for
+\fI\%http://puppetlabs.com/projects/puppet/reference/configref.html\fP for
 the full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppetmasterdd
 with \(aq\-\-genconfig\(aq.
@@ -145,7 +145,7 @@ sudo puppetrun \-p 10 \-\-host host1 \-\-host host2 \-t remotefile \-t webserver
 Luke Kanies
 .SH COPYRIGHT
 .sp
-Copyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public
+Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public
 License
 .\" Generated by docutils manpage writer.
 .\" 
diff --git a/man/man8/ralsh.8 b/man/man8/ralsh.8
index 98892e0c9..c2c5c85e9 100644
--- a/man/man8/ralsh.8
+++ b/man/man8/ralsh.8
@@ -42,7 +42,7 @@ configuration parameter, so you can specify \(aq\-\-ssldir <directory>\(aq as an
 argument.
 .sp
 See the configuration file documentation at
-\fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
+\fI\%http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
 \(aq\-\-genconfig\(aq.
@@ -116,7 +116,7 @@ user { \(aqluke\(aq:
 Luke Kanies
 .SH COPYRIGHT
 .sp
-Copyright (c) 2005\-2007 Reductive Labs, LLC Licensed under the GNU
+Copyright (c) 2005\-2007 Puppet Labs, LLC Licensed under the GNU
 Public License
 .\" Generated by docutils manpage writer.
 .\" 
diff --git a/sbin/puppetca b/sbin/puppetca
index 27ba916b5..87e83fc67 100755
--- a/sbin/puppetca
+++ b/sbin/puppetca
@@ -26,7 +26,7 @@
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/projects/puppet/reference/configref.html for
+# http://puppetlabs.com/projects/puppet/reference/configref.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppetca with
 # '--genconfig'.
@@ -95,7 +95,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'puppet/application/puppetca'
diff --git a/sbin/puppetd b/sbin/puppetd
index 873d32813..6be19c7af 100755
--- a/sbin/puppetd
+++ b/sbin/puppetd
@@ -57,7 +57,7 @@
 # parameter, so you can specify '--server <servername>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
+# http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppetd with
 # '--genconfig'.
@@ -153,7 +153,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005, 2006 Reductive Labs, LLC
+# Copyright (c) 2005, 2006 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'puppet/application/puppetd'
diff --git a/sbin/puppetmasterd b/sbin/puppetmasterd
index 9f12f678c..bc7d42471 100755
--- a/sbin/puppetmasterd
+++ b/sbin/puppetmasterd
@@ -21,7 +21,7 @@
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
+# http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppetmasterdd with
 # '--genconfig'.
@@ -59,7 +59,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'puppet/application/puppetmasterd'
diff --git a/sbin/puppetqd b/sbin/puppetqd
index 5487a324f..234572f9f 100755
--- a/sbin/puppetqd
+++ b/sbin/puppetqd
@@ -19,7 +19,7 @@
 # parameter, so you can specify '--server <servername>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
+# http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppetd with
 # '--genconfig'.
@@ -46,7 +46,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2009 Reductive Labs, LLC
+# Copyright (c) 2009 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'puppet/application/puppetqd'
diff --git a/sbin/puppetrun b/sbin/puppetrun
index d3b2630af..e629f1ca8 100755
--- a/sbin/puppetrun
+++ b/sbin/puppetrun
@@ -63,7 +63,7 @@
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/projects/puppet/reference/configref.html for
+# http://puppetlabs.com/projects/puppet/reference/configref.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppetmasterdd with
 # '--genconfig'.
@@ -122,7 +122,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'puppet/application/puppetrun'
diff --git a/spec/unit/application/filebucket.rb b/spec/unit/application/filebucket.rb
index e87bab402..c0a6dcc7f 100644
--- a/spec/unit/application/filebucket.rb
+++ b/spec/unit/application/filebucket.rb
@@ -124,9 +124,9 @@ describe "Filebucket" do
         describe "with remote bucket" do
 
             it "should create a remote Client to the configured server" do
-                Puppet.stubs(:[]).with(:server).returns("puppet.reductivelabs.com")
+                Puppet.stubs(:[]).with(:server).returns("puppet.puppetlabs.com")
 
-                Puppet::Network::Client::Dipper.expects(:new).with { |h| h[:Server] == "puppet.reductivelabs.com" }
+                Puppet::Network::Client::Dipper.expects(:new).with { |h| h[:Server] == "puppet.puppetlabs.com" }
 
                 @filebucket.run_setup
             end
diff --git a/spec/unit/application/puppetd.rb b/spec/unit/application/puppetd.rb
index 0f7257e59..88772b2f1 100755
--- a/spec/unit/application/puppetd.rb
+++ b/spec/unit/application/puppetd.rb
@@ -275,10 +275,10 @@ describe "puppetd" do
 
         it "should set a central log destination with --centrallogs" do
             @puppetd.options.stubs(:[]).with(:centrallogs).returns(true)
-            Puppet.stubs(:[]).with(:server).returns("puppet.reductivelabs.com")
+            Puppet.stubs(:[]).with(:server).returns("puppet.puppetlabs.com")
             Puppet::Util::Log.stubs(:newdestination).with(:syslog)
 
-            Puppet::Util::Log.expects(:newdestination).with("puppet.reductivelabs.com")
+            Puppet::Util::Log.expects(:newdestination).with("puppet.puppetlabs.com")
 
             @puppetd.run_setup
         end
diff --git a/spec/unit/parser/ast/leaf.rb b/spec/unit/parser/ast/leaf.rb
index 62ebc2ab1..5e7516b1d 100755
--- a/spec/unit/parser/ast/leaf.rb
+++ b/spec/unit/parser/ast/leaf.rb
@@ -233,8 +233,8 @@ describe Puppet::Parser::AST::HostName do
     end
 
     it "should return a string usable as a tag when calling to_classname" do
-        host = Puppet::Parser::AST::HostName.new( :value => Puppet::Parser::AST::Regex.new(:value => "/.+.reductivelabs\.com/") )
-        host.to_classname.should == "reductivelabs.com"
+        host = Puppet::Parser::AST::HostName.new( :value => Puppet::Parser::AST::Regex.new(:value => "/.+.puppetlabs\.com/") )
+        host.to_classname.should == "puppetlabs.com"
     end
 
     it "should delegate 'match' to the underlying value if it is an HostName" do
diff --git a/spec/unit/provider/ssh_authorized_key/parsed.rb b/spec/unit/provider/ssh_authorized_key/parsed.rb
index 9abcda54f..d5c66d7b0 100755
--- a/spec/unit/provider/ssh_authorized_key/parsed.rb
+++ b/spec/unit/provider/ssh_authorized_key/parsed.rb
@@ -73,7 +73,7 @@ describe provider_class do
     end
 
     it "'s parse_options method should be able to parse options containing commas" do
-        options = %w{from="host1.reductlivelabs.com,host.reductivelabs.com" command="/usr/local/bin/run" ssh-pty}
+        options = %w{from="host1.reductlivelabs.com,host.puppetlabs.com" command="/usr/local/bin/run" ssh-pty}
         optionstr = options.join(", ")
 
         @provider.parse_options(optionstr).should == options
diff --git a/tasks/rake/git_workflow.rake b/tasks/rake/git_workflow.rake
index b2f96c603..5ef568c7b 100644
--- a/tasks/rake/git_workflow.rake
+++ b/tasks/rake/git_workflow.rake
@@ -1,5 +1,5 @@
 # This set of tasks helps automate the workflow as described on
-# http://reductivelabs.com/trac/puppet/wiki/Development/DevelopmentLifecycle
+# http://puppetlabs.com/trac/puppet/wiki/Development/DevelopmentLifecycle
 
 
 def find_start(start)
diff --git a/tasks/rake/sign.rake b/tasks/rake/sign.rake
index 2eed60df0..d5d393575 100644
--- a/tasks/rake/sign.rake
+++ b/tasks/rake/sign.rake
@@ -1,4 +1,4 @@
-desc "Sign to the package with the Reductive Labs release key"
+desc "Sign to the package with the Puppet Labs release key"
 task :sign_packages do
 
 version = Puppet::PUPPETVERSION
diff --git a/test/certmgr/certmgr.rb b/test/certmgr/certmgr.rb
index 2c4605f03..de63fc399 100755
--- a/test/certmgr/certmgr.rb
+++ b/test/certmgr/certmgr.rb
@@ -126,7 +126,7 @@ class TestCertMgr < Test::Unit::TestCase
                 :city => "Nashville",
                 :country => "US",
                 :email => "luke@madstop.com",
-                :org => "Reductive",
+                :org => "Puppet",
                 :ou => "Development",
                 :encrypt => mkPassFile()
             )
diff --git a/test/data/providers/ssh_authorized_key/parsed/authorized_keys b/test/data/providers/ssh_authorized_key/parsed/authorized_keys
index b22329dca..e99e07998 100644
--- a/test/data/providers/ssh_authorized_key/parsed/authorized_keys
+++ b/test/data/providers/ssh_authorized_key/parsed/authorized_keys
@@ -1,7 +1,7 @@
 ssh-dss AAAAB3NzaC1kc3MAAACBAJkupmdsJSDXfUy5EU5NTRBDr9Woo3w0YnB8KmnJW9ghU8C7SkWPB1fIHVe+esFfd3qWBseb83PoFX63geZJAg6bjV4/Rdn1zEoa9EO2QyUdYUen4+rpsh3vVKZ6HFNsn3+W5+kPYgE1F/N4INqkbjY3sqCkP/W1BL9+sbVVbuJFAAAAFQCfjWDk5XhvGUkPjNWWVqltBYzHtwAAAIEAg/XL7ky7x9Ad5banzPFAfmM+DGFe0A/JEbLDjKmr5KBM5x4RFohtEvZ8ECuVGUOqBWdgAjyYwsG4oRVjLnKrf/rgmbNRzSFgEWkcAye3BVwk7Dt6hh4knEl+mNfOLq+FH0011UhecOiqTcESMzQDtgQ1vJh2VchElBLjl3x/ZugAAACAAh5jGQC338t5ObP8trSlOefkx0sXmmEzUbo3Mt8mGUuGJPx8m+X0L8Xd+l5rQxytqE3SmV/RD+6REqBuPqHM8RQuqAzfjdOeg/Ajdggx1CRMTVhltZsgQoxO30cz9Qo0SdPoL+Jp1fLuaLZq7m/RmsWYvoLT3jebBlpvvQE8YlI= francois.deppierraz@nimag.net
 ssh-dss AAAAB3NzaC1kc3MAAACBAJkupmdsJSDXfUy5EU5NTRBDr9Woo3w0YnB8KmnJW9ghU8C7SkWPB1fIHVe+esFfd3qWBseb83PoFX63geZJAg6bjV4/Rdn1zEoa9EO2QyUdYUen4+rpsh3vVKZ6HFNsn3+W5+kPYgE1F/N4INqkbjY3sqCkP/W1BL9+sbVVbuJFAAAAFQCfjWDk5XhvGUkPjNWWVqltBYzHtwAAAIEAg/XL7ky7x9Ad5banzPFAfmM+DGFe0A/JEbLDjKmr5KBM5x4RFohtEvZ8ECuVGUOqBWdgAjyYwsG4oRVjLnKrf/rgmbNRzSFgEWkcAye3BVwk7Dt6hh4knEl+mNfOLq+FH0011UhecOiqTcESMzQDtgQ1vJh2VchElBLjl3x/ZugAAACAAh5jGQC338t5ObP8trSlOefkx0sXmmEzUbo3Mt8mGUuGJPx8m+X0L8Xd+l5rQxytqE3SmV/RD+6REqBuPqHM8RQuqAzfjdOeg/Ajdggx1CRMTVhltZsgQoxO30cz9Qo0SdPoL+Jp1fLuaLZq7m/RmsWYvoLT3jebBlpvvQE8YlI= Francois Deppierraz <francois@ctrlaltdel.ch>
 from="192.168.1.1",command="/bin/false",no-pty,no-port-forwarding ssh-dss AAAAB3NzaC1kc3MAAACBAJkupmdsJSDXfUy5EU5NTRBDr9Woo3w0YnB8KmnJW9ghU8C7SkWPB1fIHVe+esFfd3qWBseb83PoFX63geZJAg6bjV4/Rdn1zEoa9EO2QyUdYUen4+rpsh3vVKZ6HFNsn3+W5+kPYgE1F/N4INqkbjY3sqCkP/W1BL9+sbVVbuJFAAAAFQCfjWDk5XhvGUkPjNWWVqltBYzHtwAAAIEAg/XL7ky7x9Ad5banzPFAfmM+DGFe0A/JEbLDjKmr5KBM5x4RFohtEvZ8ECuVGUOqBWdgAjyYwsG4oRVjLnKrf/rgmbNRzSFgEWkcAye3BVwk7Dt6hh4knEl+mNfOLq+FH0011UhecOiqTcESMzQDtgQ1vJh2VchElBLjl3x/ZugAAACAAh5jGQC338t5ObP8trSlOefkx0sXmmEzUbo3Mt8mGUuGJPx8m+X0L8Xd+l5rQxytqE3SmV/RD+6REqBuPqHM8RQuqAzfjdOeg/Ajdggx1CRMTVhltZsgQoxO30cz9Qo0SdPoL+Jp1fLuaLZq7m/RmsWYvoLT3jebBlpvvQE8YlI= Francois Deppierraz
-from="192.168.1.1, www.reductivelabs.com",command="/bin/false",no-pty,no-port-forwarding ssh-dss AAAAB3NzaC1kc3MAAACBAJkupmdsJSDXfUy5EU5NTRBDr9Woo3w0YnB8KmnJW9ghU8C7SkWPB1fIHVe+esFfd3qWBseb83PoFX63geZJAg6bjV4/Rdn1zEoa9EO2QyUdYUen4+rpsh3vVKZ6HFNsn3+W5+kPYgE1F/N4INqkbjY3sqCkP/W1BL9+sbVVbuJFAAAAFQCfjWDk5XhvGUkPjNWWVqltBYzHtwAAAIEAg/XL7ky7x9Ad5banzPFAfmM+DGFe0A/JEbLDjKmr5KBM5x4RFohtEvZ8ECuVGUOqBWdgAjyYwsG4oRVjLnKrf/rgmbNRzSFgEWkcAye3BVwk7Dt6hh4knEl+mNfOLq+FH0011UhecOiqTcESMzQDtgQ1vJh2VchElBLjl3x/ZugAAACAAh5jGQC338t5ObP8trSlOefkx0sXmmEzUbo3Mt8mGUuGJPx8m+X0L8Xd+l5rQxytqE3SmV/RD+6REqBuPqHM8RQuqAzfjdOeg/Ajdggx1CRMTVhltZsgQoxO30cz9Qo0SdPoL+Jp1fLuaLZq7m/RmsWYvoLT3jebBlpvvQE8YlI= Francois Deppierraz
+from="192.168.1.1, www.puppetlabs.com",command="/bin/false",no-pty,no-port-forwarding ssh-dss AAAAB3NzaC1kc3MAAACBAJkupmdsJSDXfUy5EU5NTRBDr9Woo3w0YnB8KmnJW9ghU8C7SkWPB1fIHVe+esFfd3qWBseb83PoFX63geZJAg6bjV4/Rdn1zEoa9EO2QyUdYUen4+rpsh3vVKZ6HFNsn3+W5+kPYgE1F/N4INqkbjY3sqCkP/W1BL9+sbVVbuJFAAAAFQCfjWDk5XhvGUkPjNWWVqltBYzHtwAAAIEAg/XL7ky7x9Ad5banzPFAfmM+DGFe0A/JEbLDjKmr5KBM5x4RFohtEvZ8ECuVGUOqBWdgAjyYwsG4oRVjLnKrf/rgmbNRzSFgEWkcAye3BVwk7Dt6hh4knEl+mNfOLq+FH0011UhecOiqTcESMzQDtgQ1vJh2VchElBLjl3x/ZugAAACAAh5jGQC338t5ObP8trSlOefkx0sXmmEzUbo3Mt8mGUuGJPx8m+X0L8Xd+l5rQxytqE3SmV/RD+6REqBuPqHM8RQuqAzfjdOeg/Ajdggx1CRMTVhltZsgQoxO30cz9Qo0SdPoL+Jp1fLuaLZq7m/RmsWYvoLT3jebBlpvvQE8YlI= Francois Deppierraz
 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA2Vi+TdC3iOGYcIo5vGTvC9P9rjHl9RxCuZmSfn+YDFQ35RXf0waijtjp9I7GYh6R4hBjA5z0u/Pzi95LET5NfRM0Gdc0DJyvBI7K+ALBxIT383Iz6Yz4iKxe1TEJgHGM2he4+7BHkjc3kdIZqIpZjucCk4VsXSxujO4MKKvtaKK2l+kahlLQHHw/vZkDpIgL52iGVsjW9l8RLJaKHZ4mDHJN/Q/Rzn2W4EvcdHUzwhvGMwZlm8clDwITBrSsawYtnivJrQSYcmTRqJuS8wprNDrLIhTGjrwFg5WpruUuMt6fLuCqwe6TeEL+nh3DQ4g554c5aRp3oU6LGBKTvNZGWQ== francois@korn
 ssh-dss AAAAB3NzaC1kc3MAAACBAMPpCYnjywOemd8LqbbmC+bePNR3/H1rXsiFwjSLhYE3bbOpvclvOzN1DruFc34m0FopVnMkP+aubjdIYF8pijl+5hg9ggB7Kno2dl0Dd1rGN/swvmhA8OpLAQv7Qt7UnXKVho3as08zYZsrHxYFu0wlnkdbsv4cy4aXyQKd4MPVAAAAFQDSyQFWg8Qt3wU05buhZ10psoR7tQAAAIEAmAhguXwUnI3P2FF5NAW/mpJUmUERdL4pyZARUyAgpf7ezwrh9TJqrvGTQNBF97Xqaivyncm5JWQdMIsTBxEFaXZGkmBta02KnWcn447qvIh7iv8XpNL6M9flCkBEZOJ4t9El0ytTSHHaiCz8A20Et+E8evWyi1kXkFDt8ML2dGgAAACBAK0X4ympbdEjgV/ZyOc+BU22u7vOnfSOUJmyar4Ax1MIDNnoyNWKnGvxRutydQcQOKQHZEU0fE8MhPFn6nLF6CoVfEl/oz0EYz3hjV4WPFpHrF5DY/rhvNj8iuneKJ5P0dy/rG6m5qey25PnHyGFVoIRlkHJvBCJT40dHs40YEjI francois@korn
 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAut8aOSxenjOqF527dlsdHWV4MNoAsX14l9M297+SQXaQ5Z3BedIxZaoQthkDALlV/25A1COELrg9J2MqJNQc8Xe9XQOIkBQWWinUlD/BXwoOTWEy8C8zSZPHZ3getMMNhGTBO+q/O+qiJx3y5cA4MTbw2zSxukfWC87qWwcZ64UUlegIM056vPsdZWFclS9hsROVEa57YUMrehQ1EGxT4Z5j6zIopufGFiAPjZigq/vqgcAqhAKP6yu4/gwO6S9tatBeEjZ8fafvj1pmvvIplZeMr96gHE7xS3pEEQqnB3nd4RY7AF6j9kFixnsytAUO7STPh/M3pLiVQBN89TvWPQ==
diff --git a/test/network/handler/ca.rb b/test/network/handler/ca.rb
index 16782bb18..f528c7bc0 100755
--- a/test/network/handler/ca.rb
+++ b/test/network/handler/ca.rb
@@ -69,7 +69,7 @@ class TestCA < Test::Unit::TestCase
         newtext = nil
         assert_nothing_raised {
             newtext, cacerttext = ca.getcert(
-                cert.csr.to_s, "test.reductivelabs.com", "127.0.0.1"
+                cert.csr.to_s, "test.puppetlabs.com", "127.0.0.1"
             )
         }
 
@@ -110,7 +110,7 @@ class TestCA < Test::Unit::TestCase
         certtext = nil
         assert_nothing_raised {
             certtext, cacerttext = caserv.getcert(
-                cert.csr.to_s, "test.reductivelabs.com", "127.0.0.1"
+                cert.csr.to_s, "test.puppetlabs.com", "127.0.0.1"
             )
         }
 
@@ -167,7 +167,7 @@ class TestCA < Test::Unit::TestCase
         # make sure we know what's going on
         assert(caserv.autosign?("hostmatch.domain.com"))
         assert(caserv.autosign?("fakehost.other.com"))
-        assert(!caserv.autosign?("kirby.reductivelabs.com"))
+        assert(!caserv.autosign?("kirby.puppetlabs.com"))
         assert(!caserv.autosign?("culain.domain.com"))
     end
 
@@ -181,7 +181,7 @@ class TestCA < Test::Unit::TestCase
         # make sure we know what's going on
         assert(!caserv.autosign?("hostmatch.domain.com"))
         assert(!caserv.autosign?("fakehost.other.com"))
-        assert(!caserv.autosign?("kirby.reductivelabs.com"))
+        assert(!caserv.autosign?("kirby.puppetlabs.com"))
         assert(!caserv.autosign?("culain.domain.com"))
     end
 
diff --git a/test/test b/test/test
index 097885751..c8b9b08ef 100755
--- a/test/test
+++ b/test/test
@@ -68,7 +68,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'find'