diff --git a/setup.py b/setup.py
index 669c16fa2..d7fbca4e3 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack, LLC
+# Copyright 2011 OpenStack Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tools/check_i18n.py b/tools/check_i18n.py
index 43a4f9bc3..705b2d3dd 100644
--- a/tools/check_i18n.py
+++ b/tools/check_i18n.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-#    Copyright 2012 OpenStack LLC
+#    Copyright 2012 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/tools/install_venv.py b/tools/install_venv.py
index b927989b1..ddb3d82c1 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -5,7 +5,7 @@
 # Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
-# Copyright 2010 OpenStack LLC.
+# Copyright 2010 OpenStack Foundation.
 # Copyright 2013 IBM Corp.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/tools/with_venv.sh b/tools/with_venv.sh
index 93eaa889f..5c4a271e4 100755
--- a/tools/with_venv.sh
+++ b/tools/with_venv.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may