summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Winn <sean.winn@cloudscaling.com>2013-08-26 06:32:10 -0700
committerSteve Martinelli <stevemar@ca.ibm.com>2013-09-05 15:03:32 -0500
commit0331f8a58a0440ed1b875f21d976b6d782094e4b (patch)
tree1218f85c8d95776b7b2b8fe19b87c40a6c1b2cd4
parent5e4914742e2b6a3ed3d42a379ceb5e7b3b79edd4 (diff)
downloadkeystone-0331f8a58a0440ed1b875f21d976b6d782094e4b.tar.gz
Changed header from LLC to Foundation based on trademark policies
Fixes: Bug 1214176 Change-Id: Ie937081a53d377671b8b88f422642c8131002f88
-rw-r--r--doc/source/apache-httpd.rst2
-rw-r--r--doc/source/api_curl_examples.rst2
-rw-r--r--doc/source/architecture.rst2
-rw-r--r--doc/source/community.rst2
-rw-r--r--doc/source/configuration.rst2
-rw-r--r--doc/source/configuringservices.rst2
-rw-r--r--doc/source/developing.rst2
-rw-r--r--doc/source/index.rst2
-rw-r--r--doc/source/installing.rst2
-rw-r--r--doc/source/man/keystone-all.rst2
-rw-r--r--doc/source/man/keystone-manage.rst2
-rw-r--r--doc/source/middlewarearchitecture.rst2
-rw-r--r--doc/source/setup.rst2
-rwxr-xr-xexamples/pki/gen_pki.sh2
-rw-r--r--keystone/assignment/__init__.py2
-rw-r--r--keystone/assignment/backends/kvs.py2
-rw-r--r--keystone/assignment/backends/ldap.py2
-rw-r--r--keystone/assignment/backends/sql.py2
-rw-r--r--keystone/assignment/core.py2
-rw-r--r--keystone/auth/__init__.py2
-rw-r--r--keystone/auth/controllers.py2
-rw-r--r--keystone/auth/core.py2
-rw-r--r--keystone/auth/plugins/external.py2
-rw-r--r--keystone/auth/plugins/password.py2
-rw-r--r--keystone/auth/plugins/token.py2
-rw-r--r--keystone/auth/routers.py2
-rw-r--r--keystone/catalog/__init__.py2
-rw-r--r--keystone/catalog/backends/kvs.py2
-rw-r--r--keystone/catalog/backends/sql.py2
-rw-r--r--keystone/catalog/backends/templated.py2
-rw-r--r--keystone/catalog/controllers.py2
-rw-r--r--keystone/catalog/core.py2
-rw-r--r--keystone/catalog/routers.py2
-rw-r--r--keystone/clean.py2
-rw-r--r--keystone/cli.py2
-rw-r--r--keystone/common/config.py2
-rw-r--r--keystone/common/dependency.py2
-rw-r--r--keystone/common/environment/eventlet_server.py4
-rw-r--r--keystone/common/extension.py2
-rw-r--r--keystone/common/kvs.py2
-rw-r--r--keystone/common/ldap/__init__.py2
-rw-r--r--keystone/common/ldap/core.py2
-rw-r--r--keystone/common/manager.py2
-rw-r--r--keystone/common/models.py2
-rw-r--r--keystone/common/openssl.py2
-rw-r--r--keystone/common/router.py2
-rw-r--r--keystone/common/serializer.py2
-rw-r--r--keystone/common/sql/__init__.py2
-rw-r--r--keystone/common/sql/core.py2
-rw-r--r--keystone/common/sql/migrate_repo/versions/001_add_initial_tables.py2
-rw-r--r--keystone/common/sql/migrate_repo/versions/005_set_utf8_character_set.py2
-rw-r--r--keystone/common/sql/migrate_repo/versions/006_add_policy_table.py2
-rw-r--r--keystone/common/sql/migrate_repo/versions/007_add_domain_tables.py2
-rw-r--r--keystone/common/sql/migrate_repo/versions/008_create_default_domain.py2
-rw-r--r--keystone/common/sql/migrate_repo/versions/009_normalize_identity.py2
-rw-r--r--keystone/common/sql/migrate_repo/versions/010_normalize_identity_migration.py2
-rw-r--r--keystone/common/sql/migrate_repo/versions/011_endpoints_v3.py2
-rw-r--r--keystone/common/sql/migrate_repo/versions/012_populate_endpoint_type.py2
-rw-r--r--keystone/common/sql/migrate_repo/versions/013_drop_legacy_endpoints.py2
-rw-r--r--keystone/common/sql/migrate_repo/versions/014_add_group_tables.py2
-rw-r--r--keystone/common/sql/migrate_repo/versions/016_normalize_domain_ids.py2
-rw-r--r--keystone/common/sql/migrate_repo/versions/018_add_trust_tables.py2
-rw-r--r--keystone/common/sql/migrate_repo/versions/021_add_trust_to_token.py2
-rw-r--r--keystone/common/sql/migrate_repo/versions/023_drop_credential_constraints.py2
-rw-r--r--keystone/common/sql/migrate_repo/versions/026_drop_user_group_constraints.py2
-rw-r--r--keystone/common/sql/migrate_repo/versions/028_fixup_group_metadata.py2
-rw-r--r--keystone/common/sql/migrate_repo/versions/029_update_assignment_metadata.py2
-rw-r--r--keystone/common/sql/migrate_repo/versions/030_drop_credential_constraint_sqlite.py2
-rw-r--r--keystone/common/sql/migrate_repo/versions/033_migrate_ec2credentials_table_credentials.py2
-rw-r--r--keystone/common/sql/migration.py2
-rw-r--r--keystone/common/sql/migration_helpers.py2
-rw-r--r--keystone/common/utils.py2
-rw-r--r--keystone/common/wsgi.py4
-rw-r--r--keystone/config.py2
-rw-r--r--keystone/contrib/access/__init__.py2
-rw-r--r--keystone/contrib/access/core.py2
-rw-r--r--keystone/contrib/admin_crud/__init__.py2
-rw-r--r--keystone/contrib/admin_crud/core.py2
-rw-r--r--keystone/contrib/ec2/__init__.py2
-rw-r--r--keystone/contrib/ec2/controllers.py2
-rw-r--r--keystone/contrib/ec2/core.py2
-rw-r--r--keystone/contrib/ec2/routers.py2
-rw-r--r--keystone/contrib/example/migrate_repo/versions/001_example_table.py2
-rw-r--r--keystone/contrib/s3/__init__.py2
-rw-r--r--keystone/contrib/s3/core.py2
-rw-r--r--keystone/contrib/stats/__init__.py2
-rw-r--r--keystone/contrib/stats/backends/kvs.py2
-rw-r--r--keystone/contrib/stats/core.py2
-rw-r--r--keystone/controllers.py2
-rw-r--r--keystone/credential/__init__.py2
-rw-r--r--keystone/credential/backends/sql.py2
-rw-r--r--keystone/credential/controllers.py2
-rw-r--r--keystone/credential/core.py2
-rw-r--r--keystone/credential/routers.py2
-rw-r--r--keystone/exception.py2
-rw-r--r--keystone/identity/__init__.py2
-rw-r--r--keystone/identity/backends/kvs.py2
-rw-r--r--keystone/identity/backends/ldap.py2
-rw-r--r--keystone/identity/backends/pam.py2
-rw-r--r--keystone/identity/backends/sql.py2
-rw-r--r--keystone/identity/controllers.py2
-rw-r--r--keystone/identity/core.py2
-rw-r--r--keystone/identity/routers.py2
-rw-r--r--keystone/middleware/__init__.py2
-rw-r--r--keystone/middleware/auth_token.py2
-rw-r--r--keystone/middleware/core.py2
-rw-r--r--keystone/middleware/ec2_token.py2
-rw-r--r--keystone/middleware/s3_token.py2
-rw-r--r--keystone/openstack/common/policy.py2
-rw-r--r--keystone/policy/__init__.py2
-rw-r--r--keystone/policy/controllers.py2
-rw-r--r--keystone/policy/core.py2
-rw-r--r--keystone/policy/routers.py2
-rw-r--r--keystone/routers.py2
-rw-r--r--keystone/service.py2
-rw-r--r--keystone/tests/_ldap_livetest.py2
-rw-r--r--keystone/tests/_ldap_tls_livetest.py2
-rw-r--r--keystone/tests/core.py2
-rw-r--r--keystone/tests/default_fixtures.py2
-rw-r--r--keystone/tests/test_auth.py2
-rw-r--r--keystone/tests/test_auth_plugin.py2
-rw-r--r--keystone/tests/test_backend.py2
-rw-r--r--keystone/tests/test_backend_kvs.py2
-rw-r--r--keystone/tests/test_backend_ldap.py2
-rw-r--r--keystone/tests/test_backend_memcache.py2
-rw-r--r--keystone/tests/test_backend_pam.py2
-rw-r--r--keystone/tests/test_backend_sql.py2
-rw-r--r--keystone/tests/test_backend_templated.py2
-rw-r--r--keystone/tests/test_cert_setup.py2
-rw-r--r--keystone/tests/test_content_types.py2
-rw-r--r--keystone/tests/test_contrib_s3_core.py2
-rw-r--r--keystone/tests/test_contrib_stats_core.py2
-rw-r--r--keystone/tests/test_exception.py2
-rw-r--r--keystone/tests/test_injection.py2
-rw-r--r--keystone/tests/test_ipv6.py2
-rw-r--r--keystone/tests/test_keystoneclient.py2
-rw-r--r--keystone/tests/test_keystoneclient_sql.py2
-rw-r--r--keystone/tests/test_middleware.py2
-rw-r--r--keystone/tests/test_s3_token_middleware.py2
-rw-r--r--keystone/tests/test_serializer.py2
-rw-r--r--keystone/tests/test_sizelimit.py2
-rw-r--r--keystone/tests/test_sql_migrate_extensions.py2
-rw-r--r--keystone/tests/test_sql_upgrade.py2
-rw-r--r--keystone/tests/test_ssl.py2
-rw-r--r--keystone/tests/test_token_bind.py2
-rw-r--r--keystone/tests/test_token_provider.py2
-rw-r--r--keystone/tests/test_url_middleware.py2
-rw-r--r--keystone/tests/test_utils.py2
-rw-r--r--keystone/tests/test_v3_auth.py2
-rw-r--r--keystone/tests/test_v3_credential.py2
-rw-r--r--keystone/tests/test_v3_identity.py2
-rw-r--r--keystone/tests/test_v3_protection.py2
-rw-r--r--keystone/tests/test_versions.py2
-rw-r--r--keystone/tests/test_wsgi.py2
-rw-r--r--keystone/token/__init__.py2
-rw-r--r--keystone/token/backends/kvs.py2
-rw-r--r--keystone/token/backends/memcache.py2
-rw-r--r--keystone/token/backends/sql.py2
-rw-r--r--keystone/token/core.py2
-rw-r--r--keystone/token/provider.py2
-rw-r--r--keystone/token/providers/pki.py2
-rw-r--r--keystone/token/providers/uuid.py2
-rw-r--r--keystone/token/routers.py2
-rw-r--r--keystone/trust/__init__.py2
-rw-r--r--keystone/trust/backends/kvs.py2
-rw-r--r--keystone/trust/backends/sql.py2
-rw-r--r--keystone/trust/core.py2
-rw-r--r--keystone/trust/routers.py2
-rwxr-xr-xrun_tests.sh2
-rw-r--r--tools/install_venv.py2
-rwxr-xr-xtools/sample_data.sh2
171 files changed, 173 insertions, 173 deletions
diff --git a/doc/source/apache-httpd.rst b/doc/source/apache-httpd.rst
index 5bc0dbe8c..f4b6cb570 100644
--- a/doc/source/apache-httpd.rst
+++ b/doc/source/apache-httpd.rst
@@ -1,6 +1,6 @@
..
- Copyright 2011-2012 OpenStack, LLC
+ Copyright 2011-2012 OpenStack Foundation
All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/doc/source/api_curl_examples.rst b/doc/source/api_curl_examples.rst
index 1ee185bcd..0a8ecf8ba 100644
--- a/doc/source/api_curl_examples.rst
+++ b/doc/source/api_curl_examples.rst
@@ -1,5 +1,5 @@
..
- Copyright 2011-2012 OpenStack, LLC
+ Copyright 2011-2012 OpenStack Foundation
All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/doc/source/architecture.rst b/doc/source/architecture.rst
index 38f0ca641..02e601134 100644
--- a/doc/source/architecture.rst
+++ b/doc/source/architecture.rst
@@ -1,5 +1,5 @@
..
- Copyright 2011-2012 OpenStack, LLC
+ Copyright 2011-2012 OpenStack Foundation
All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/doc/source/community.rst b/doc/source/community.rst
index a4ca44ebb..dc3398822 100644
--- a/doc/source/community.rst
+++ b/doc/source/community.rst
@@ -1,5 +1,5 @@
..
- Copyright 2011-2012 OpenStack, LLC
+ Copyright 2011-2012 OpenStack Foundation
All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index 1847c3c98..c845212e9 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -1,5 +1,5 @@
..
- Copyright 2011-2012 OpenStack, LLC
+ Copyright 2011-2012 OpenStack Foundation
All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/doc/source/configuringservices.rst b/doc/source/configuringservices.rst
index 645ab5dae..c6dbc30ef 100644
--- a/doc/source/configuringservices.rst
+++ b/doc/source/configuringservices.rst
@@ -1,5 +1,5 @@
..
- Copyright 2011-2012 OpenStack, LLC
+ Copyright 2011-2012 OpenStack Foundation
All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/doc/source/developing.rst b/doc/source/developing.rst
index 2ab77344b..ec0268cad 100644
--- a/doc/source/developing.rst
+++ b/doc/source/developing.rst
@@ -1,5 +1,5 @@
..
- Copyright 2011-2012 OpenStack, LLC
+ Copyright 2011-2012 OpenStack Foundation
All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 9eacd6f8f..ebaddc454 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1,5 +1,5 @@
..
- Copyright 2011-2012 OpenStack, LLC
+ Copyright 2011-2012 OpenStack Foundation
All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/doc/source/installing.rst b/doc/source/installing.rst
index 80bc1b4c0..4b956ff5a 100644
--- a/doc/source/installing.rst
+++ b/doc/source/installing.rst
@@ -1,5 +1,5 @@
..
- Copyright 2012 OpenStack, LLC
+ Copyright 2012 OpenStack Foundation
Copyright 2012 Nebula, Inc
All Rights Reserved.
diff --git a/doc/source/man/keystone-all.rst b/doc/source/man/keystone-all.rst
index 0eda3718c..69cde9e3d 100644
--- a/doc/source/man/keystone-all.rst
+++ b/doc/source/man/keystone-all.rst
@@ -8,7 +8,7 @@ Keystone Startup Command
:Author: openstack@lists.openstack.org
:Date: 2010-11-16
-:Copyright: OpenStack LLC
+:Copyright: OpenStack Foundation
:Version: 2012.1
:Manual section: 1
:Manual group: cloud computing
diff --git a/doc/source/man/keystone-manage.rst b/doc/source/man/keystone-manage.rst
index c8dbdb069..1f9de69a9 100644
--- a/doc/source/man/keystone-manage.rst
+++ b/doc/source/man/keystone-manage.rst
@@ -8,7 +8,7 @@ Keystone Management Utility
:Author: openstack@lists.openstack.org
:Date: 2010-11-16
-:Copyright: OpenStack LLC
+:Copyright: OpenStack Foundation
:Version: 2012.1
:Manual section: 1
:Manual group: cloud computing
diff --git a/doc/source/middlewarearchitecture.rst b/doc/source/middlewarearchitecture.rst
index 8cd4729ba..d2885a6f1 100644
--- a/doc/source/middlewarearchitecture.rst
+++ b/doc/source/middlewarearchitecture.rst
@@ -1,5 +1,5 @@
..
- Copyright 2011-2012 OpenStack, LLC
+ Copyright 2011-2012 OpenStack Foundation
All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/doc/source/setup.rst b/doc/source/setup.rst
index a0c7d1798..9e22a135d 100644
--- a/doc/source/setup.rst
+++ b/doc/source/setup.rst
@@ -1,5 +1,5 @@
..
- Copyright 2011-2012 OpenStack, LLC
+ Copyright 2011-2012 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 002ca89cc..85369d29f 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/keystone/assignment/__init__.py b/keystone/assignment/__init__.py
index 5a8483086..6ac424025 100644
--- a/keystone/assignment/__init__.py
+++ b/keystone/assignment/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# flake8: noqa
-# 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/keystone/assignment/backends/kvs.py b/keystone/assignment/backends/kvs.py
index 30d7b2eb6..e12fb30b2 100644
--- a/keystone/assignment/backends/kvs.py
+++ b/keystone/assignment/backends/kvs.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/keystone/assignment/backends/ldap.py b/keystone/assignment/backends/ldap.py
index 2d6a86725..83a460376 100644
--- a/keystone/assignment/backends/ldap.py
+++ b/keystone/assignment/backends/ldap.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2012-2013 OpenStack LLC
+# Copyright 2012-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/keystone/assignment/backends/sql.py b/keystone/assignment/backends/sql.py
index 577612942..158233fad 100644
--- a/keystone/assignment/backends/sql.py
+++ b/keystone/assignment/backends/sql.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2012-13 OpenStack LLC
+# Copyright 2012-13 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/keystone/assignment/core.py b/keystone/assignment/core.py
index ac76f53b7..cd28a18f3 100644
--- a/keystone/assignment/core.py
+++ b/keystone/assignment/core.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/keystone/auth/__init__.py b/keystone/auth/__init__.py
index 570e03842..27e2c4f87 100644
--- a/keystone/auth/__init__.py
+++ b/keystone/auth/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# flake8: noqa
-# 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/keystone/auth/controllers.py b/keystone/auth/controllers.py
index a571fc255..c3399dfb0 100644
--- a/keystone/auth/controllers.py
+++ b/keystone/auth/controllers.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/keystone/auth/core.py b/keystone/auth/core.py
index 26e7a470b..90017e4ad 100644
--- a/keystone/auth/core.py
+++ b/keystone/auth/core.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/keystone/auth/plugins/external.py b/keystone/auth/plugins/external.py
index c00c5cff3..882af394f 100644
--- a/keystone/auth/plugins/external.py
+++ b/keystone/auth/plugins/external.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/keystone/auth/plugins/password.py b/keystone/auth/plugins/password.py
index b069f4d97..769f02444 100644
--- a/keystone/auth/plugins/password.py
+++ b/keystone/auth/plugins/password.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/keystone/auth/plugins/token.py b/keystone/auth/plugins/token.py
index e4af77acb..50def926d 100644
--- a/keystone/auth/plugins/token.py
+++ b/keystone/auth/plugins/token.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/keystone/auth/routers.py b/keystone/auth/routers.py
index 52466f348..ba29b2f52 100644
--- a/keystone/auth/routers.py
+++ b/keystone/auth/routers.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/keystone/catalog/__init__.py b/keystone/catalog/__init__.py
index 4aaa2e124..35fb00f69 100644
--- a/keystone/catalog/__init__.py
+++ b/keystone/catalog/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# flake8: noqa
-# 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/keystone/catalog/backends/kvs.py b/keystone/catalog/backends/kvs.py
index 82a303516..7962cba96 100644
--- a/keystone/catalog/backends/kvs.py
+++ b/keystone/catalog/backends/kvs.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/keystone/catalog/backends/sql.py b/keystone/catalog/backends/sql.py
index d7b2123a6..8f7952bba 100644
--- a/keystone/catalog/backends/sql.py
+++ b/keystone/catalog/backends/sql.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
#
-# Copyright 2012 OpenStack LLC
+# Copyright 2012 OpenStack Foundation
# Copyright 2012 Canonical Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/keystone/catalog/backends/templated.py b/keystone/catalog/backends/templated.py
index db99110bf..407b9fa20 100644
--- a/keystone/catalog/backends/templated.py
+++ b/keystone/catalog/backends/templated.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2012 OpenStack LLC
+# Copyright 2012 OpenStack Foundationc
#
# 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/keystone/catalog/controllers.py b/keystone/catalog/controllers.py
index 019afd21d..6c36e9d53 100644
--- a/keystone/catalog/controllers.py
+++ b/keystone/catalog/controllers.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2012 OpenStack LLC
+# Copyright 2012 OpenStack Foundation
# Copyright 2012 Canonical Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/keystone/catalog/core.py b/keystone/catalog/core.py
index 61b7e8acd..7cc49d5c3 100644
--- a/keystone/catalog/core.py
+++ b/keystone/catalog/core.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2012 OpenStack LLC
+# Copyright 2012 OpenStack Foundation
# Copyright 2012 Canonical Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/keystone/catalog/routers.py b/keystone/catalog/routers.py
index b3af4bc13..ad76b41e4 100644
--- a/keystone/catalog/routers.py
+++ b/keystone/catalog/routers.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/keystone/clean.py b/keystone/clean.py
index cb6c69c0a..bac4923e3 100644
--- a/keystone/clean.py
+++ b/keystone/clean.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/keystone/cli.py b/keystone/cli.py
index 8704b5dfd..af2c2dc85 100644
--- a/keystone/cli.py
+++ b/keystone/cli.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/keystone/common/config.py b/keystone/common/config.py
index 17dd6e50b..bf30cb3c2 100644
--- a/keystone/common/config.py
+++ b/keystone/common/config.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/keystone/common/dependency.py b/keystone/common/dependency.py
index a640031d9..b04d08212 100644
--- a/keystone/common/dependency.py
+++ b/keystone/common/dependency.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/keystone/common/environment/eventlet_server.py b/keystone/common/environment/eventlet_server.py
index 874c48310..02879b08e 100644
--- a/keystone/common/environment/eventlet_server.py
+++ b/keystone/common/environment/eventlet_server.py
@@ -1,9 +1,9 @@
# 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 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/keystone/common/extension.py b/keystone/common/extension.py
index f176a1970..9170d143c 100644
--- a/keystone/common/extension.py
+++ b/keystone/common/extension.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/keystone/common/kvs.py b/keystone/common/kvs.py
index 096939998..a8acdf3ef 100644
--- a/keystone/common/kvs.py
+++ b/keystone/common/kvs.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/keystone/common/ldap/__init__.py b/keystone/common/ldap/__init__.py
index adc3a2767..24069356c 100644
--- a/keystone/common/ldap/__init__.py
+++ b/keystone/common/ldap/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# flake8: noqa
-# 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/keystone/common/ldap/core.py b/keystone/common/ldap/core.py
index f1c368a98..1507f63d2 100644
--- a/keystone/common/ldap/core.py
+++ b/keystone/common/ldap/core.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/keystone/common/manager.py b/keystone/common/manager.py
index 22d1080ff..693a7bb34 100644
--- a/keystone/common/manager.py
+++ b/keystone/common/manager.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/keystone/common/models.py b/keystone/common/models.py
index 8ae2fede0..d5c4983ba 100644
--- a/keystone/common/models.py
+++ b/keystone/common/models.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
#
-# Copyright (C) 2011 OpenStack LLC.
+# Copyright (C) 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/keystone/common/openssl.py b/keystone/common/openssl.py
index ac6f6e517..36a834bb5 100644
--- a/keystone/common/openssl.py
+++ b/keystone/common/openssl.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/keystone/common/router.py b/keystone/common/router.py
index c3abc94cb..d35d3ca32 100644
--- a/keystone/common/router.py
+++ b/keystone/common/router.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/keystone/common/serializer.py b/keystone/common/serializer.py
index 4355a0596..6598191a8 100644
--- a/keystone/common/serializer.py
+++ b/keystone/common/serializer.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/keystone/common/sql/__init__.py b/keystone/common/sql/__init__.py
index b069482f8..ee65b12d8 100644
--- a/keystone/common/sql/__init__.py
+++ b/keystone/common/sql/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# flake8: noqa
-# 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/keystone/common/sql/core.py b/keystone/common/sql/core.py
index a9def6010..df6e058a0 100644
--- a/keystone/common/sql/core.py
+++ b/keystone/common/sql/core.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/keystone/common/sql/migrate_repo/versions/001_add_initial_tables.py b/keystone/common/sql/migrate_repo/versions/001_add_initial_tables.py
index 84243cb93..64fff312c 100644
--- a/keystone/common/sql/migrate_repo/versions/001_add_initial_tables.py
+++ b/keystone/common/sql/migrate_repo/versions/001_add_initial_tables.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/keystone/common/sql/migrate_repo/versions/005_set_utf8_character_set.py b/keystone/common/sql/migrate_repo/versions/005_set_utf8_character_set.py
index 067899bf0..1f1ff2af2 100644
--- a/keystone/common/sql/migrate_repo/versions/005_set_utf8_character_set.py
+++ b/keystone/common/sql/migrate_repo/versions/005_set_utf8_character_set.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/keystone/common/sql/migrate_repo/versions/006_add_policy_table.py b/keystone/common/sql/migrate_repo/versions/006_add_policy_table.py
index 52c031b42..0be005b0b 100644
--- a/keystone/common/sql/migrate_repo/versions/006_add_policy_table.py
+++ b/keystone/common/sql/migrate_repo/versions/006_add_policy_table.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/keystone/common/sql/migrate_repo/versions/007_add_domain_tables.py b/keystone/common/sql/migrate_repo/versions/007_add_domain_tables.py
index 17f877993..6fda6ec8c 100644
--- a/keystone/common/sql/migrate_repo/versions/007_add_domain_tables.py
+++ b/keystone/common/sql/migrate_repo/versions/007_add_domain_tables.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/keystone/common/sql/migrate_repo/versions/008_create_default_domain.py b/keystone/common/sql/migrate_repo/versions/008_create_default_domain.py
index 387d75edb..23153225d 100644
--- a/keystone/common/sql/migrate_repo/versions/008_create_default_domain.py
+++ b/keystone/common/sql/migrate_repo/versions/008_create_default_domain.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/keystone/common/sql/migrate_repo/versions/009_normalize_identity.py b/keystone/common/sql/migrate_repo/versions/009_normalize_identity.py
index 7941ca022..dec7bbb47 100644
--- a/keystone/common/sql/migrate_repo/versions/009_normalize_identity.py
+++ b/keystone/common/sql/migrate_repo/versions/009_normalize_identity.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/keystone/common/sql/migrate_repo/versions/010_normalize_identity_migration.py b/keystone/common/sql/migrate_repo/versions/010_normalize_identity_migration.py
index c7841406c..4f0199de9 100644
--- a/keystone/common/sql/migrate_repo/versions/010_normalize_identity_migration.py
+++ b/keystone/common/sql/migrate_repo/versions/010_normalize_identity_migration.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/keystone/common/sql/migrate_repo/versions/011_endpoints_v3.py b/keystone/common/sql/migrate_repo/versions/011_endpoints_v3.py
index b0f880864..08eb5821e 100644
--- a/keystone/common/sql/migrate_repo/versions/011_endpoints_v3.py
+++ b/keystone/common/sql/migrate_repo/versions/011_endpoints_v3.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/keystone/common/sql/migrate_repo/versions/012_populate_endpoint_type.py b/keystone/common/sql/migrate_repo/versions/012_populate_endpoint_type.py
index a4a03a670..e1e380cde 100644
--- a/keystone/common/sql/migrate_repo/versions/012_populate_endpoint_type.py
+++ b/keystone/common/sql/migrate_repo/versions/012_populate_endpoint_type.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/keystone/common/sql/migrate_repo/versions/013_drop_legacy_endpoints.py b/keystone/common/sql/migrate_repo/versions/013_drop_legacy_endpoints.py
index deb52947b..93c731a3a 100644
--- a/keystone/common/sql/migrate_repo/versions/013_drop_legacy_endpoints.py
+++ b/keystone/common/sql/migrate_repo/versions/013_drop_legacy_endpoints.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/keystone/common/sql/migrate_repo/versions/014_add_group_tables.py b/keystone/common/sql/migrate_repo/versions/014_add_group_tables.py
index 845db1e31..0e15874a5 100644
--- a/keystone/common/sql/migrate_repo/versions/014_add_group_tables.py
+++ b/keystone/common/sql/migrate_repo/versions/014_add_group_tables.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/keystone/common/sql/migrate_repo/versions/016_normalize_domain_ids.py b/keystone/common/sql/migrate_repo/versions/016_normalize_domain_ids.py
index f28060e62..bf1ed6524 100644
--- a/keystone/common/sql/migrate_repo/versions/016_normalize_domain_ids.py
+++ b/keystone/common/sql/migrate_repo/versions/016_normalize_domain_ids.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2012 OpenStack LLC
+# Copyright 2012 OpenStack Foundation
# Copyright 2013 IBM Corp.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/keystone/common/sql/migrate_repo/versions/018_add_trust_tables.py b/keystone/common/sql/migrate_repo/versions/018_add_trust_tables.py
index 46ed5ce00..99f165eae 100644
--- a/keystone/common/sql/migrate_repo/versions/018_add_trust_tables.py
+++ b/keystone/common/sql/migrate_repo/versions/018_add_trust_tables.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/keystone/common/sql/migrate_repo/versions/021_add_trust_to_token.py b/keystone/common/sql/migrate_repo/versions/021_add_trust_to_token.py
index 444435b2b..1de51e1b8 100644
--- a/keystone/common/sql/migrate_repo/versions/021_add_trust_to_token.py
+++ b/keystone/common/sql/migrate_repo/versions/021_add_trust_to_token.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/keystone/common/sql/migrate_repo/versions/023_drop_credential_constraints.py b/keystone/common/sql/migrate_repo/versions/023_drop_credential_constraints.py
index 8888e6510..99967e6a9 100644
--- a/keystone/common/sql/migrate_repo/versions/023_drop_credential_constraints.py
+++ b/keystone/common/sql/migrate_repo/versions/023_drop_credential_constraints.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/keystone/common/sql/migrate_repo/versions/026_drop_user_group_constraints.py b/keystone/common/sql/migrate_repo/versions/026_drop_user_group_constraints.py
index 949458300..266085c4a 100644
--- a/keystone/common/sql/migrate_repo/versions/026_drop_user_group_constraints.py
+++ b/keystone/common/sql/migrate_repo/versions/026_drop_user_group_constraints.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/keystone/common/sql/migrate_repo/versions/028_fixup_group_metadata.py b/keystone/common/sql/migrate_repo/versions/028_fixup_group_metadata.py
index 66055a991..d1ca484ca 100644
--- a/keystone/common/sql/migrate_repo/versions/028_fixup_group_metadata.py
+++ b/keystone/common/sql/migrate_repo/versions/028_fixup_group_metadata.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/keystone/common/sql/migrate_repo/versions/029_update_assignment_metadata.py b/keystone/common/sql/migrate_repo/versions/029_update_assignment_metadata.py
index a92768048..82e992b73 100644
--- a/keystone/common/sql/migrate_repo/versions/029_update_assignment_metadata.py
+++ b/keystone/common/sql/migrate_repo/versions/029_update_assignment_metadata.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/keystone/common/sql/migrate_repo/versions/030_drop_credential_constraint_sqlite.py b/keystone/common/sql/migrate_repo/versions/030_drop_credential_constraint_sqlite.py
index 27676dcc6..5d6e3d26d 100644
--- a/keystone/common/sql/migrate_repo/versions/030_drop_credential_constraint_sqlite.py
+++ b/keystone/common/sql/migrate_repo/versions/030_drop_credential_constraint_sqlite.py
@@ -1,7 +1,7 @@
# 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/keystone/common/sql/migrate_repo/versions/033_migrate_ec2credentials_table_credentials.py b/keystone/common/sql/migrate_repo/versions/033_migrate_ec2credentials_table_credentials.py
index 4175a8a18..e389e9bb3 100644
--- a/keystone/common/sql/migrate_repo/versions/033_migrate_ec2credentials_table_credentials.py
+++ b/keystone/common/sql/migrate_repo/versions/033_migrate_ec2credentials_table_credentials.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/keystone/common/sql/migration.py b/keystone/common/sql/migration.py
index 3cb9cd630..e4c0aec96 100644
--- a/keystone/common/sql/migration.py
+++ b/keystone/common/sql/migration.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.
# All Rights Reserved.
diff --git a/keystone/common/sql/migration_helpers.py b/keystone/common/sql/migration_helpers.py
index 8a5819243..48fa188ce 100644
--- a/keystone/common/sql/migration_helpers.py
+++ b/keystone/common/sql/migration_helpers.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2013 OpenStack LLC
+# Copyright 2013 OpenStack Foundation
# Copyright 2013 Red Hat, Inc.
# All Rights Reserved.
#
diff --git a/keystone/common/utils.py b/keystone/common/utils.py
index d52a77e25..d27ed4d2f 100644
--- a/keystone/common/utils.py
+++ b/keystone/common/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/keystone/common/wsgi.py b/keystone/common/wsgi.py
index 6f00affbb..b6eb474b1 100644
--- a/keystone/common/wsgi.py
+++ b/keystone/common/wsgi.py
@@ -1,9 +1,9 @@
# 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 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/keystone/config.py b/keystone/config.py
index c4a43b47f..6afdb19b7 100644
--- a/keystone/config.py
+++ b/keystone/config.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/keystone/contrib/access/__init__.py b/keystone/contrib/access/__init__.py
index 6eb9aa43e..28e6c6510 100644
--- a/keystone/contrib/access/__init__.py
+++ b/keystone/contrib/access/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# flake8: noqa
-# 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/keystone/contrib/access/core.py b/keystone/contrib/access/core.py
index fbe09a249..09573ad66 100644
--- a/keystone/contrib/access/core.py
+++ b/keystone/contrib/access/core.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/keystone/contrib/admin_crud/__init__.py b/keystone/contrib/admin_crud/__init__.py
index e0d488f3e..9511edc99 100644
--- a/keystone/contrib/admin_crud/__init__.py
+++ b/keystone/contrib/admin_crud/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# flake8: noqa
-# 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/keystone/contrib/admin_crud/core.py b/keystone/contrib/admin_crud/core.py
index f98397aee..8f6bf9cde 100644
--- a/keystone/contrib/admin_crud/core.py
+++ b/keystone/contrib/admin_crud/core.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/keystone/contrib/ec2/__init__.py b/keystone/contrib/ec2/__init__.py
index 8edcca47b..18492c673 100644
--- a/keystone/contrib/ec2/__init__.py
+++ b/keystone/contrib/ec2/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# flake8: noqa
-# 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/keystone/contrib/ec2/controllers.py b/keystone/contrib/ec2/controllers.py
index 34e663d4e..928f3227e 100644
--- a/keystone/contrib/ec2/controllers.py
+++ b/keystone/contrib/ec2/controllers.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/keystone/contrib/ec2/core.py b/keystone/contrib/ec2/core.py
index fa14f19ce..dffc8e2b3 100644
--- a/keystone/contrib/ec2/core.py
+++ b/keystone/contrib/ec2/core.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/keystone/contrib/ec2/routers.py b/keystone/contrib/ec2/routers.py
index ee5db59bc..562bda589 100644
--- a/keystone/contrib/ec2/routers.py
+++ b/keystone/contrib/ec2/routers.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/keystone/contrib/example/migrate_repo/versions/001_example_table.py b/keystone/contrib/example/migrate_repo/versions/001_example_table.py
index bb2203d39..7f7de147a 100644
--- a/keystone/contrib/example/migrate_repo/versions/001_example_table.py
+++ b/keystone/contrib/example/migrate_repo/versions/001_example_table.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/keystone/contrib/s3/__init__.py b/keystone/contrib/s3/__init__.py
index c77b04e90..518ca4a27 100644
--- a/keystone/contrib/s3/__init__.py
+++ b/keystone/contrib/s3/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# flake8: noqa
-# 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/keystone/contrib/s3/core.py b/keystone/contrib/s3/core.py
index f34545e41..dbbc5af97 100644
--- a/keystone/contrib/s3/core.py
+++ b/keystone/contrib/s3/core.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/keystone/contrib/stats/__init__.py b/keystone/contrib/stats/__init__.py
index 74eaa95ea..db880bc42 100644
--- a/keystone/contrib/stats/__init__.py
+++ b/keystone/contrib/stats/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# flake8: noqa
-# 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/keystone/contrib/stats/backends/kvs.py b/keystone/contrib/stats/backends/kvs.py
index 06db5677b..1f347ffc8 100644
--- a/keystone/contrib/stats/backends/kvs.py
+++ b/keystone/contrib/stats/backends/kvs.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/keystone/contrib/stats/core.py b/keystone/contrib/stats/core.py
index 9e6538db9..0568db144 100644
--- a/keystone/contrib/stats/core.py
+++ b/keystone/contrib/stats/core.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/keystone/controllers.py b/keystone/controllers.py
index be3c57fa9..635915c2e 100644
--- a/keystone/controllers.py
+++ b/keystone/controllers.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/keystone/credential/__init__.py b/keystone/credential/__init__.py
index 4891a2103..621f7a13b 100644
--- a/keystone/credential/__init__.py
+++ b/keystone/credential/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# flake8: noqa
-# 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/keystone/credential/backends/sql.py b/keystone/credential/backends/sql.py
index 313728b12..3f9ad1d92 100644
--- a/keystone/credential/backends/sql.py
+++ b/keystone/credential/backends/sql.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/keystone/credential/controllers.py b/keystone/credential/controllers.py
index f66fd864e..bddd64e7a 100644
--- a/keystone/credential/controllers.py
+++ b/keystone/credential/controllers.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/keystone/credential/core.py b/keystone/credential/core.py
index 768ea9222..95e307b98 100644
--- a/keystone/credential/core.py
+++ b/keystone/credential/core.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/keystone/credential/routers.py b/keystone/credential/routers.py
index 2b27a0393..06378b966 100644
--- a/keystone/credential/routers.py
+++ b/keystone/credential/routers.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/keystone/exception.py b/keystone/exception.py
index 3bef16714..a01fc4ee2 100644
--- a/keystone/exception.py
+++ b/keystone/exception.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/keystone/identity/__init__.py b/keystone/identity/__init__.py
index 514db7883..0bb3094ae 100644
--- a/keystone/identity/__init__.py
+++ b/keystone/identity/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# flake8: noqa
-# 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/keystone/identity/backends/kvs.py b/keystone/identity/backends/kvs.py
index bcfb777b8..405feb7b1 100644
--- a/keystone/identity/backends/kvs.py
+++ b/keystone/identity/backends/kvs.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/keystone/identity/backends/ldap.py b/keystone/identity/backends/ldap.py
index 979dee241..d04f7367c 100644
--- a/keystone/identity/backends/ldap.py
+++ b/keystone/identity/backends/ldap.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/keystone/identity/backends/pam.py b/keystone/identity/backends/pam.py
index 7d45ba708..e2575ff1a 100644
--- a/keystone/identity/backends/pam.py
+++ b/keystone/identity/backends/pam.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/keystone/identity/backends/sql.py b/keystone/identity/backends/sql.py
index f647e26a5..7717edbdc 100644
--- a/keystone/identity/backends/sql.py
+++ b/keystone/identity/backends/sql.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/keystone/identity/controllers.py b/keystone/identity/controllers.py
index 7efd28ab6..4c48dd8fa 100644
--- a/keystone/identity/controllers.py
+++ b/keystone/identity/controllers.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/keystone/identity/core.py b/keystone/identity/core.py
index cbe74ae89..d5ec63d66 100644
--- a/keystone/identity/core.py
+++ b/keystone/identity/core.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/keystone/identity/routers.py b/keystone/identity/routers.py
index 5f2368425..bf85eaa02 100644
--- a/keystone/identity/routers.py
+++ b/keystone/identity/routers.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/keystone/middleware/__init__.py b/keystone/middleware/__init__.py
index 1135f7843..9bfd68fff 100644
--- a/keystone/middleware/__init__.py
+++ b/keystone/middleware/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# flake8: noqa
-# 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/keystone/middleware/auth_token.py b/keystone/middleware/auth_token.py
index 25e2685e0..63b7365ad 100644
--- a/keystone/middleware/auth_token.py
+++ b/keystone/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/keystone/middleware/core.py b/keystone/middleware/core.py
index 92b179c3f..fc88af614 100644
--- a/keystone/middleware/core.py
+++ b/keystone/middleware/core.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/keystone/middleware/ec2_token.py b/keystone/middleware/ec2_token.py
index 7cd007c72..0cd58418f 100644
--- a/keystone/middleware/ec2_token.py
+++ b/keystone/middleware/ec2_token.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.
# All Rights Reserved.
diff --git a/keystone/middleware/s3_token.py b/keystone/middleware/s3_token.py
index 396785913..342cee465 100644
--- a/keystone/middleware/s3_token.py
+++ b/keystone/middleware/s3_token.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 Akira YOSHIYAMA <akirayoshiyama@gmail.com>
diff --git a/keystone/openstack/common/policy.py b/keystone/openstack/common/policy.py
index a4c05139c..eb44fe416 100644
--- a/keystone/openstack/common/policy.py
+++ b/keystone/openstack/common/policy.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 2012 OpenStack Foundation
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/keystone/policy/__init__.py b/keystone/policy/__init__.py
index 5ed700eb5..5e4837545 100644
--- a/keystone/policy/__init__.py
+++ b/keystone/policy/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# flake8: noqa
-# 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/keystone/policy/controllers.py b/keystone/policy/controllers.py
index af6b1cb9c..8c207c0dd 100644
--- a/keystone/policy/controllers.py
+++ b/keystone/policy/controllers.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/keystone/policy/core.py b/keystone/policy/core.py
index 3ed1b4d6c..9da7176ff 100644
--- a/keystone/policy/core.py
+++ b/keystone/policy/core.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/keystone/policy/routers.py b/keystone/policy/routers.py
index 270e9b761..da9c6cb0b 100644
--- a/keystone/policy/routers.py
+++ b/keystone/policy/routers.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/keystone/routers.py b/keystone/routers.py
index f1a380e7e..9bf6b0027 100644
--- a/keystone/routers.py
+++ b/keystone/routers.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/keystone/service.py b/keystone/service.py
index 845fa2460..cde4c08a2 100644
--- a/keystone/service.py
+++ b/keystone/service.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/keystone/tests/_ldap_livetest.py b/keystone/tests/_ldap_livetest.py
index cbc9302d5..c4c588589 100644
--- a/keystone/tests/_ldap_livetest.py
+++ b/keystone/tests/_ldap_livetest.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/keystone/tests/_ldap_tls_livetest.py b/keystone/tests/_ldap_tls_livetest.py
index f1c43453d..e5f09b6e9 100644
--- a/keystone/tests/_ldap_tls_livetest.py
+++ b/keystone/tests/_ldap_tls_livetest.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2013 OpenStack LLC
+# Copyright 2013 OpenStack Foundation
# Copyright 2013 IBM Corp.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/keystone/tests/core.py b/keystone/tests/core.py
index 576cd8253..1789e5e97 100644
--- a/keystone/tests/core.py
+++ b/keystone/tests/core.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/keystone/tests/default_fixtures.py b/keystone/tests/default_fixtures.py
index 2695da888..bff9c374a 100644
--- a/keystone/tests/default_fixtures.py
+++ b/keystone/tests/default_fixtures.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/keystone/tests/test_auth.py b/keystone/tests/test_auth.py
index 475b23a17..7794a00fc 100644
--- a/keystone/tests/test_auth.py
+++ b/keystone/tests/test_auth.py
@@ -1,4 +1,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/keystone/tests/test_auth_plugin.py b/keystone/tests/test_auth_plugin.py
index e3346cf18..536281dfa 100644
--- a/keystone/tests/test_auth_plugin.py
+++ b/keystone/tests/test_auth_plugin.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/keystone/tests/test_backend.py b/keystone/tests/test_backend.py
index a2aff4969..79a72b306 100644
--- a/keystone/tests/test_backend.py
+++ b/keystone/tests/test_backend.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/keystone/tests/test_backend_kvs.py b/keystone/tests/test_backend_kvs.py
index 34b87c607..1b3cb0260 100644
--- a/keystone/tests/test_backend_kvs.py
+++ b/keystone/tests/test_backend_kvs.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/keystone/tests/test_backend_ldap.py b/keystone/tests/test_backend_ldap.py
index c544d4994..1fd049b9f 100644
--- a/keystone/tests/test_backend_ldap.py
+++ b/keystone/tests/test_backend_ldap.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2012 OpenStack LLC
+# Copyright 2012 OpenStack Foundation
# Copyright 2013 IBM Corp.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/keystone/tests/test_backend_memcache.py b/keystone/tests/test_backend_memcache.py
index 435993ffa..625cc117d 100644
--- a/keystone/tests/test_backend_memcache.py
+++ b/keystone/tests/test_backend_memcache.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/keystone/tests/test_backend_pam.py b/keystone/tests/test_backend_pam.py
index 65817837c..5b555abfc 100644
--- a/keystone/tests/test_backend_pam.py
+++ b/keystone/tests/test_backend_pam.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/keystone/tests/test_backend_sql.py b/keystone/tests/test_backend_sql.py
index cfd916557..9d456b217 100644
--- a/keystone/tests/test_backend_sql.py
+++ b/keystone/tests/test_backend_sql.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/keystone/tests/test_backend_templated.py b/keystone/tests/test_backend_templated.py
index d7681614f..cbbaa2762 100644
--- a/keystone/tests/test_backend_templated.py
+++ b/keystone/tests/test_backend_templated.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/keystone/tests/test_cert_setup.py b/keystone/tests/test_cert_setup.py
index 88fa6d753..ae7f63023 100644
--- a/keystone/tests/test_cert_setup.py
+++ b/keystone/tests/test_cert_setup.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.
diff --git a/keystone/tests/test_content_types.py b/keystone/tests/test_content_types.py
index 7c8747324..8ddc89544 100644
--- a/keystone/tests/test_content_types.py
+++ b/keystone/tests/test_content_types.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/keystone/tests/test_contrib_s3_core.py b/keystone/tests/test_contrib_s3_core.py
index 3438cba68..cf6bea7f6 100644
--- a/keystone/tests/test_contrib_s3_core.py
+++ b/keystone/tests/test_contrib_s3_core.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/keystone/tests/test_contrib_stats_core.py b/keystone/tests/test_contrib_stats_core.py
index 567c485eb..db49dda9c 100644
--- a/keystone/tests/test_contrib_stats_core.py
+++ b/keystone/tests/test_contrib_stats_core.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/keystone/tests/test_exception.py b/keystone/tests/test_exception.py
index b6b1a080f..b79d10049 100644
--- a/keystone/tests/test_exception.py
+++ b/keystone/tests/test_exception.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/keystone/tests/test_injection.py b/keystone/tests/test_injection.py
index 02accb562..fda0dc2f8 100644
--- a/keystone/tests/test_injection.py
+++ b/keystone/tests/test_injection.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/keystone/tests/test_ipv6.py b/keystone/tests/test_ipv6.py
index fa64bc431..8b8492e5f 100644
--- a/keystone/tests/test_ipv6.py
+++ b/keystone/tests/test_ipv6.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.
diff --git a/keystone/tests/test_keystoneclient.py b/keystone/tests/test_keystoneclient.py
index 4126adeb8..228fe77a3 100644
--- a/keystone/tests/test_keystoneclient.py
+++ b/keystone/tests/test_keystoneclient.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/keystone/tests/test_keystoneclient_sql.py b/keystone/tests/test_keystoneclient_sql.py
index f3a32300f..d61c565b6 100644
--- a/keystone/tests/test_keystoneclient_sql.py
+++ b/keystone/tests/test_keystoneclient_sql.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/keystone/tests/test_middleware.py b/keystone/tests/test_middleware.py
index df33d172c..24bf20253 100644
--- a/keystone/tests/test_middleware.py
+++ b/keystone/tests/test_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/keystone/tests/test_s3_token_middleware.py b/keystone/tests/test_s3_token_middleware.py
index 8152ae759..67a34efde 100644
--- a/keystone/tests/test_s3_token_middleware.py
+++ b/keystone/tests/test_s3_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/keystone/tests/test_serializer.py b/keystone/tests/test_serializer.py
index 260a533cf..433f4ba80 100644
--- a/keystone/tests/test_serializer.py
+++ b/keystone/tests/test_serializer.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/keystone/tests/test_sizelimit.py b/keystone/tests/test_sizelimit.py
index a37b0e31f..345c0044d 100644
--- a/keystone/tests/test_sizelimit.py
+++ b/keystone/tests/test_sizelimit.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 OpenStack, LLC
+# Copyright (c) 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/keystone/tests/test_sql_migrate_extensions.py b/keystone/tests/test_sql_migrate_extensions.py
index c8dc13ee9..25350a641 100644
--- a/keystone/tests/test_sql_migrate_extensions.py
+++ b/keystone/tests/test_sql_migrate_extensions.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/keystone/tests/test_sql_upgrade.py b/keystone/tests/test_sql_upgrade.py
index bf14894e7..c4ab1a132 100644
--- a/keystone/tests/test_sql_upgrade.py
+++ b/keystone/tests/test_sql_upgrade.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/keystone/tests/test_ssl.py b/keystone/tests/test_ssl.py
index cb6b5fdc8..d91fde682 100644
--- a/keystone/tests/test_ssl.py
+++ b/keystone/tests/test_ssl.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.
diff --git a/keystone/tests/test_token_bind.py b/keystone/tests/test_token_bind.py
index ae398ea1f..e574b527d 100644
--- a/keystone/tests/test_token_bind.py
+++ b/keystone/tests/test_token_bind.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
diff --git a/keystone/tests/test_token_provider.py b/keystone/tests/test_token_provider.py
index e2d9a77c1..683e1ffbd 100644
--- a/keystone/tests/test_token_provider.py
+++ b/keystone/tests/test_token_provider.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/keystone/tests/test_url_middleware.py b/keystone/tests/test_url_middleware.py
index 436eb8d4c..6f20d4d46 100644
--- a/keystone/tests/test_url_middleware.py
+++ b/keystone/tests/test_url_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/keystone/tests/test_utils.py b/keystone/tests/test_utils.py
index 90e0a54bb..ec4f2509d 100644
--- a/keystone/tests/test_utils.py
+++ b/keystone/tests/test_utils.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/keystone/tests/test_v3_auth.py b/keystone/tests/test_v3_auth.py
index 9167dfc21..5a8e7ecc0 100644
--- a/keystone/tests/test_v3_auth.py
+++ b/keystone/tests/test_v3_auth.py
@@ -1,4 +1,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/keystone/tests/test_v3_credential.py b/keystone/tests/test_v3_credential.py
index f56b602c8..98e689ad1 100644
--- a/keystone/tests/test_v3_credential.py
+++ b/keystone/tests/test_v3_credential.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/keystone/tests/test_v3_identity.py b/keystone/tests/test_v3_identity.py
index 7e34193d1..b13df2968 100644
--- a/keystone/tests/test_v3_identity.py
+++ b/keystone/tests/test_v3_identity.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/keystone/tests/test_v3_protection.py b/keystone/tests/test_v3_protection.py
index a963536f3..0e49ee08d 100644
--- a/keystone/tests/test_v3_protection.py
+++ b/keystone/tests/test_v3_protection.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2012 OpenStack LLC
+# Copyright 2012 OpenStack Foundation
# Copyright 2013 IBM Corp.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/keystone/tests/test_versions.py b/keystone/tests/test_versions.py
index 933fb2462..805151e30 100644
--- a/keystone/tests/test_versions.py
+++ b/keystone/tests/test_versions.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.
diff --git a/keystone/tests/test_wsgi.py b/keystone/tests/test_wsgi.py
index 3efe7bbbf..3a7ee3b97 100644
--- a/keystone/tests/test_wsgi.py
+++ b/keystone/tests/test_wsgi.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/keystone/token/__init__.py b/keystone/token/__init__.py
index ffd9bc44a..a120002c4 100644
--- a/keystone/token/__init__.py
+++ b/keystone/token/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# flake8: noqa
-# 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/keystone/token/backends/kvs.py b/keystone/token/backends/kvs.py
index 3e97318af..b3f991ab7 100644
--- a/keystone/token/backends/kvs.py
+++ b/keystone/token/backends/kvs.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/keystone/token/backends/memcache.py b/keystone/token/backends/memcache.py
index b80d01bc6..2582c49c6 100644
--- a/keystone/token/backends/memcache.py
+++ b/keystone/token/backends/memcache.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/keystone/token/backends/sql.py b/keystone/token/backends/sql.py
index e1e5183ab..455a37b6b 100644
--- a/keystone/token/backends/sql.py
+++ b/keystone/token/backends/sql.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/keystone/token/core.py b/keystone/token/core.py
index 1ef936c85..3500af5ca 100644
--- a/keystone/token/core.py
+++ b/keystone/token/core.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/keystone/token/provider.py b/keystone/token/provider.py
index 3718387a4..36d920555 100644
--- a/keystone/token/provider.py
+++ b/keystone/token/provider.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/keystone/token/providers/pki.py b/keystone/token/providers/pki.py
index 64dde473f..21078df87 100644
--- a/keystone/token/providers/pki.py
+++ b/keystone/token/providers/pki.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/keystone/token/providers/uuid.py b/keystone/token/providers/uuid.py
index d849eefd3..ae97f50c1 100644
--- a/keystone/token/providers/uuid.py
+++ b/keystone/token/providers/uuid.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/keystone/token/routers.py b/keystone/token/routers.py
index 6b22f6484..51c247bab 100644
--- a/keystone/token/routers.py
+++ b/keystone/token/routers.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/keystone/trust/__init__.py b/keystone/trust/__init__.py
index 6b47460ec..aeda21037 100644
--- a/keystone/trust/__init__.py
+++ b/keystone/trust/__init__.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# flake8: noqa
-# 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/keystone/trust/backends/kvs.py b/keystone/trust/backends/kvs.py
index 96995e37d..bf49d358a 100644
--- a/keystone/trust/backends/kvs.py
+++ b/keystone/trust/backends/kvs.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/keystone/trust/backends/sql.py b/keystone/trust/backends/sql.py
index 9e92ad71a..47a562f15 100644
--- a/keystone/trust/backends/sql.py
+++ b/keystone/trust/backends/sql.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/keystone/trust/core.py b/keystone/trust/core.py
index c1e4d2e8b..f5e17ac14 100644
--- a/keystone/trust/core.py
+++ b/keystone/trust/core.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/keystone/trust/routers.py b/keystone/trust/routers.py
index 2d4e030a8..e464a106f 100644
--- a/keystone/trust/routers.py
+++ b/keystone/trust/routers.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/run_tests.sh b/run_tests.sh
index de566e35e..198d2564a 100755
--- a/run_tests.sh
+++ b/run_tests.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/tools/install_venv.py b/tools/install_venv.py
index 136988f67..bdd578bb4 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2013 IBM Corp.
-# 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.
# All Rights Reserved.
diff --git a/tools/sample_data.sh b/tools/sample_data.sh
index 3ad819b31..1dc4a6b4a 100755
--- a/tools/sample_data.sh
+++ b/tools/sample_data.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# 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