diff --git a/apidocs/src/cdb-devguide.xml b/apidocs/src/cdb-devguide.xml
index 35306c999a..bae83ea6f1 100644
--- a/apidocs/src/cdb-devguide.xml
+++ b/apidocs/src/cdb-devguide.xml
@@ -50,7 +50,7 @@
                 <surname/>
             </personname>
             <affiliation>
-                <orgname>OpenStack LLC</orgname>
+                <orgname>OpenStack Foundation</orgname>
             </affiliation>
         </author>
         <copyright>
@@ -58,7 +58,7 @@
             <year>2011</year>
             <year>2012</year>
             <year>2013</year>
-            <holder>OpenStack LLC</holder>
+            <holder>OpenStack Foundation</holder>
         </copyright>
         <releaseinfo>API v1.0</releaseinfo>
         <productname>OpenStack Cloud Databases</productname>
diff --git a/tools/install_venv.py b/tools/install_venv.py
index 21cdc30c11..04e174b1f3 100755
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -4,7 +4,7 @@
 # Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
-# Copyright 2010 OpenStack, LLC
+# Copyright 2010 OpenStack Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/trove/tests/api/mgmt/hosts.py b/trove/tests/api/mgmt/hosts.py
index c3d72c17f4..d057319284 100644
--- a/trove/tests/api/mgmt/hosts.py
+++ b/trove/tests/api/mgmt/hosts.py
@@ -1,4 +1,4 @@
-#    Copyright 2013 OpenStack LLC
+#    Copyright 2013 OpenStack Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain