diff --git a/doc/source/conf.py b/doc/source/conf.py
index 3dd7959..e184b61 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -26,7 +26,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-copyright = u'OpenStack LLC'
+copyright = u'OpenStack Foundation'
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
 add_function_parentheses = True
@@ -56,7 +56,7 @@ latex_documents = [
         'index',
         '%s.tex' % project,
         u'%s Documentation' % project,
-        u'OpenStack LLC',
+        u'OpenStack Foundation',
         'manual'
     ),
 ]
diff --git a/heatclient/common/base.py b/heatclient/common/base.py
index 1fbb153..02b6a69 100644
--- a/heatclient/common/base.py
+++ b/heatclient/common/base.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/heatclient/common/http.py b/heatclient/common/http.py
index 7aa5b87..ef84f7d 100644
--- a/heatclient/common/http.py
+++ b/heatclient/common/http.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/heatclient/common/utils.py b/heatclient/common/utils.py
index aa8ee0b..49753ad 100644
--- a/heatclient/common/utils.py
+++ b/heatclient/common/utils.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/heatclient/tests/test_utils.py b/heatclient/tests/test_utils.py
index 05e97fa..55d7bc7 100644
--- a/heatclient/tests/test_utils.py
+++ b/heatclient/tests/test_utils.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/heatclient/v1/__init__.py b/heatclient/v1/__init__.py
index 9278018..d801aba 100644
--- a/heatclient/v1/__init__.py
+++ b/heatclient/v1/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2012 OpenStack LLC.
+# Copyright 2012 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heatclient/v1/client.py b/heatclient/v1/client.py
index 48b0fbb..3ec6be6 100644
--- a/heatclient/v1/client.py
+++ b/heatclient/v1/client.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/heatclient/v1/events.py b/heatclient/v1/events.py
index 85f43b9..3db2f94 100644
--- a/heatclient/v1/events.py
+++ b/heatclient/v1/events.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/heatclient/v1/resources.py b/heatclient/v1/resources.py
index de88f50..476163d 100644
--- a/heatclient/v1/resources.py
+++ b/heatclient/v1/resources.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/heatclient/v1/shell.py b/heatclient/v1/shell.py
index 23bbff7..4a4bef9 100644
--- a/heatclient/v1/shell.py
+++ b/heatclient/v1/shell.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/heatclient/v1/stacks.py b/heatclient/v1/stacks.py
index 36db723..ca80293 100644
--- a/heatclient/v1/stacks.py
+++ b/heatclient/v1/stacks.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