diff --git a/doc/source/middlewarearchitecture.rst b/doc/source/middlewarearchitecture.rst
index 03782fa3e..caeff218c 100644
--- a/doc/source/middlewarearchitecture.rst
+++ b/doc/source/middlewarearchitecture.rst
@@ -1,5 +1,5 @@
 ..
-      Copyright 2011-2013 OpenStack, LLC
+      Copyright 2011-2013 OpenStack Foundation
       All Rights Reserved.
 
       Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/examples/pki/gen_pki.sh b/examples/pki/gen_pki.sh
index 6beb3b897..c5269a314 100755
--- a/examples/pki/gen_pki.sh
+++ b/examples/pki/gen_pki.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# 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/keystoneclient/__init__.py b/keystoneclient/__init__.py
index d13c009bb..07aaa7056 100644
--- a/keystoneclient/__init__.py
+++ b/keystoneclient/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2012 OpenStack LLC.
+# Copyright 2012 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/keystoneclient/base.py b/keystoneclient/base.py
index 7528bd126..30e6d1b6b 100644
--- a/keystoneclient/base.py
+++ b/keystoneclient/base.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 Jacob Kaplan-Moss
-# Copyright 2011 OpenStack LLC
+# Copyright 2011 OpenStack Foundation
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/keystoneclient/contrib/ec2/utils.py b/keystoneclient/contrib/ec2/utils.py
index 29a01f5bf..7874e0b89 100644
--- a/keystoneclient/contrib/ec2/utils.py
+++ b/keystoneclient/contrib/ec2/utils.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2012 OpenStack LLC
+# Copyright 2012 OpenStack Foundation
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
 # Copyright 2011 - 2012 Justin Santa Barbara
diff --git a/keystoneclient/generic/client.py b/keystoneclient/generic/client.py
index 7ad82219d..a1f807246 100644
--- a/keystoneclient/generic/client.py
+++ b/keystoneclient/generic/client.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010 OpenStack LLC.
+# Copyright 2010 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/keystoneclient/generic/shell.py b/keystoneclient/generic/shell.py
index 97f6308a1..2440821c0 100644
--- a/keystoneclient/generic/shell.py
+++ b/keystoneclient/generic/shell.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010 OpenStack LLC.
+# Copyright 2010 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/keystoneclient/httpclient.py b/keystoneclient/httpclient.py
index c4a98236d..7146d8c07 100644
--- a/keystoneclient/httpclient.py
+++ b/keystoneclient/httpclient.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 Jacob Kaplan-Moss
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # Copyright 2011 Piston Cloud Computing, Inc.
 # Copyright 2011 Nebula, Inc.
 # All Rights Reserved.
diff --git a/keystoneclient/middleware/auth_token.py b/keystoneclient/middleware/auth_token.py
index ea62db34a..1a13d8004 100644
--- a/keystoneclient/middleware/auth_token.py
+++ b/keystoneclient/middleware/auth_token.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010-2012 OpenStack LLC
+# Copyright 2010-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.
diff --git a/keystoneclient/middleware/memcache_crypt.py b/keystoneclient/middleware/memcache_crypt.py
index f97d08fc0..878f2e944 100644
--- a/keystoneclient/middleware/memcache_crypt.py
+++ b/keystoneclient/middleware/memcache_crypt.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010-2013 OpenStack LLC
+# Copyright 2010-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.
diff --git a/keystoneclient/service_catalog.py b/keystoneclient/service_catalog.py
index 9f569a402..8166a0206 100644
--- a/keystoneclient/service_catalog.py
+++ b/keystoneclient/service_catalog.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # Copyright 2011, Piston Cloud Computing, Inc.
 # Copyright 2011 Nebula, Inc.
 #
diff --git a/keystoneclient/shell.py b/keystoneclient/shell.py
index b530afda4..4c70bbb93 100644
--- a/keystoneclient/shell.py
+++ b/keystoneclient/shell.py
@@ -1,5 +1,5 @@
 # Copyright 2010 Jacob Kaplan-Moss
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/keystoneclient/tests/apiclient/test_exceptions.py b/keystoneclient/tests/apiclient/test_exceptions.py
index 814106085..3f730cc00 100644
--- a/keystoneclient/tests/apiclient/test_exceptions.py
+++ b/keystoneclient/tests/apiclient/test_exceptions.py
@@ -1,4 +1,4 @@
-# Copyright 2012 OpenStack LLC.
+# Copyright 2012 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/keystoneclient/tests/client_fixtures.py b/keystoneclient/tests/client_fixtures.py
index d846ac197..acb83fd77 100644
--- a/keystoneclient/tests/client_fixtures.py
+++ b/keystoneclient/tests/client_fixtures.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=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
diff --git a/keystoneclient/tests/test_auth_token_middleware.py b/keystoneclient/tests/test_auth_token_middleware.py
index 588c91f84..875844f1b 100644
--- a/keystoneclient/tests/test_auth_token_middleware.py
+++ b/keystoneclient/tests/test_auth_token_middleware.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/keystoneclient/tests/test_ec2utils.py b/keystoneclient/tests/test_ec2utils.py
index 361396d76..d4346a499 100644
--- a/keystoneclient/tests/test_ec2utils.py
+++ b/keystoneclient/tests/test_ec2utils.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/keystoneclient/tests/test_http.py b/keystoneclient/tests/test_http.py
index 4beef3455..6d5e09bed 100644
--- a/keystoneclient/tests/test_http.py
+++ b/keystoneclient/tests/test_http.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=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
diff --git a/keystoneclient/tests/v2_0/fakes.py b/keystoneclient/tests/v2_0/fakes.py
index 943efe075..09e7f20c1 100644
--- a/keystoneclient/tests/v2_0/fakes.py
+++ b/keystoneclient/tests/v2_0/fakes.py
@@ -1,5 +1,5 @@
 # Copyright (c) 2011 X.commerce, a business unit of eBay Inc.
-# 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/keystoneclient/tests/v3/test_groups.py b/keystoneclient/tests/v3/test_groups.py
index c72826709..91bb445a7 100644
--- a/keystoneclient/tests/v3/test_groups.py
+++ b/keystoneclient/tests/v3/test_groups.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/keystoneclient/tests/v3/test_roles.py b/keystoneclient/tests/v3/test_roles.py
index 8abe885e1..cc120e2ed 100644
--- a/keystoneclient/tests/v3/test_roles.py
+++ b/keystoneclient/tests/v3/test_roles.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/keystoneclient/tests/v3/test_users.py b/keystoneclient/tests/v3/test_users.py
index 92135ddaa..0372db44e 100644
--- a/keystoneclient/tests/v3/test_users.py
+++ b/keystoneclient/tests/v3/test_users.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/keystoneclient/v2_0/ec2.py b/keystoneclient/v2_0/ec2.py
index 51c6de613..0baf224f9 100644
--- a/keystoneclient/v2_0/ec2.py
+++ b/keystoneclient/v2_0/ec2.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/keystoneclient/v2_0/roles.py b/keystoneclient/v2_0/roles.py
index 2549bd025..3fc47e96f 100644
--- a/keystoneclient/v2_0/roles.py
+++ b/keystoneclient/v2_0/roles.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # Copyright 2011 Nebula, Inc.
 # All Rights Reserved.
 #
diff --git a/keystoneclient/v2_0/services.py b/keystoneclient/v2_0/services.py
index 810b7ee5e..adb740d57 100644
--- a/keystoneclient/v2_0/services.py
+++ b/keystoneclient/v2_0/services.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # Copyright 2011 Nebula, Inc.
 # All Rights Reserved.
 #
diff --git a/keystoneclient/v2_0/shell.py b/keystoneclient/v2_0/shell.py
index 2e6ca8243..d241571fe 100644
--- a/keystoneclient/v2_0/shell.py
+++ b/keystoneclient/v2_0/shell.py
@@ -1,5 +1,5 @@
 # Copyright 2010 Jacob Kaplan-Moss
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # Copyright 2011 Nebula, Inc.
 # All Rights Reserved.
 #
diff --git a/keystoneclient/v2_0/tenants.py b/keystoneclient/v2_0/tenants.py
index 6b2f5fa61..488fe93f9 100644
--- a/keystoneclient/v2_0/tenants.py
+++ b/keystoneclient/v2_0/tenants.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # Copyright 2011 Nebula, Inc.
 # All Rights Reserved.
 #
diff --git a/keystoneclient/v2_0/users.py b/keystoneclient/v2_0/users.py
index f6d0a0bd6..4e2f03df9 100644
--- a/keystoneclient/v2_0/users.py
+++ b/keystoneclient/v2_0/users.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # Copyright 2011 Nebula, Inc.
 # All Rights Reserved.
 #
diff --git a/keystoneclient/v3/credentials.py b/keystoneclient/v3/credentials.py
index 714ca21f9..6403d8d17 100644
--- a/keystoneclient/v3/credentials.py
+++ b/keystoneclient/v3/credentials.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # Copyright 2011 Nebula, Inc.
 # All Rights Reserved.
 #
diff --git a/keystoneclient/v3/domains.py b/keystoneclient/v3/domains.py
index 41ca025f7..accda3515 100644
--- a/keystoneclient/v3/domains.py
+++ b/keystoneclient/v3/domains.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # Copyright 2011 Nebula, Inc.
 # All Rights Reserved.
 #
diff --git a/keystoneclient/v3/endpoints.py b/keystoneclient/v3/endpoints.py
index 4950fa588..d7a5efac9 100644
--- a/keystoneclient/v3/endpoints.py
+++ b/keystoneclient/v3/endpoints.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # Copyright 2011 Nebula, Inc.
 # All Rights Reserved.
 #
diff --git a/keystoneclient/v3/groups.py b/keystoneclient/v3/groups.py
index 0768c448e..81bf530c2 100644
--- a/keystoneclient/v3/groups.py
+++ b/keystoneclient/v3/groups.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # Copyright 2011 Nebula, Inc.
 # All Rights Reserved.
 #
diff --git a/keystoneclient/v3/policies.py b/keystoneclient/v3/policies.py
index b628f9a58..25f6c14b0 100644
--- a/keystoneclient/v3/policies.py
+++ b/keystoneclient/v3/policies.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # Copyright 2011 Nebula, Inc.
 # All Rights Reserved.
 #
diff --git a/keystoneclient/v3/projects.py b/keystoneclient/v3/projects.py
index 25df9a622..90fe0b322 100644
--- a/keystoneclient/v3/projects.py
+++ b/keystoneclient/v3/projects.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # Copyright 2011 Nebula, Inc.
 # All Rights Reserved.
 #
diff --git a/keystoneclient/v3/roles.py b/keystoneclient/v3/roles.py
index 8bd269def..8908e227a 100644
--- a/keystoneclient/v3/roles.py
+++ b/keystoneclient/v3/roles.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # Copyright 2011 Nebula, Inc.
 # All Rights Reserved.
 #
diff --git a/keystoneclient/v3/services.py b/keystoneclient/v3/services.py
index d2134d43d..ae11f31aa 100644
--- a/keystoneclient/v3/services.py
+++ b/keystoneclient/v3/services.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # Copyright 2011 Nebula, Inc.
 # All Rights Reserved.
 #
diff --git a/keystoneclient/v3/users.py b/keystoneclient/v3/users.py
index 7bd781f62..a3a26df24 100644
--- a/keystoneclient/v3/users.py
+++ b/keystoneclient/v3/users.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # Copyright 2011 Nebula, Inc.
 # All Rights Reserved.
 #