diff --git a/apiclient/test_exceptions.py b/apiclient/test_exceptions.py
index 8141060..3f730cc 100644
--- a/apiclient/test_exceptions.py
+++ b/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/client_fixtures.py b/client_fixtures.py
index d846ac1..acb83fd 100644
--- a/client_fixtures.py
+++ b/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/test_auth_token_middleware.py b/test_auth_token_middleware.py
index 588c91f..875844f 100644
--- a/test_auth_token_middleware.py
+++ b/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/test_ec2utils.py b/test_ec2utils.py
index 361396d..d4346a4 100644
--- a/test_ec2utils.py
+++ b/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/test_http.py b/test_http.py
index 4beef34..6d5e09b 100644
--- a/test_http.py
+++ b/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/v2_0/fakes.py b/v2_0/fakes.py
index 943efe0..09e7f20 100644
--- a/v2_0/fakes.py
+++ b/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/v3/test_groups.py b/v3/test_groups.py
index c728267..91bb445 100644
--- a/v3/test_groups.py
+++ b/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/v3/test_roles.py b/v3/test_roles.py
index 8abe885..cc120e2 100644
--- a/v3/test_roles.py
+++ b/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/v3/test_users.py b/v3/test_users.py
index 92135dd..0372db4 100644
--- a/v3/test_users.py
+++ b/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