diff --git a/doc/docbkx/api-ref/src/wadls/heat-api/src/heat-api-1.0.wadl b/doc/docbkx/api-ref/src/wadls/heat-api/src/heat-api-1.0.wadl
index be9340fee..53e2ed3ba 100644
--- a/doc/docbkx/api-ref/src/wadls/heat-api/src/heat-api-1.0.wadl
+++ b/doc/docbkx/api-ref/src/wadls/heat-api/src/heat-api-1.0.wadl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- (C) 2012 OpenStack LLC., All Rights Reserved -->
+<!-- (C) 2012 OpenStack Foundation, All Rights Reserved -->
 
 <application xmlns="http://wadl.dev.java.net/2009/02"
              xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
diff --git a/doc/source/architecture.rst b/doc/source/architecture.rst
index 533f706c1..1a4df668b 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/heat/common/auth_password.py b/heat/common/auth_password.py
index 1ccdb2b9f..b308e4eed 100644
--- a/heat/common/auth_password.py
+++ b/heat/common/auth_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.
diff --git a/heat/common/auth_token.py b/heat/common/auth_token.py
index ab3e300d6..ad2bc6cca 100644
--- a/heat/common/auth_token.py
+++ b/heat/common/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/heat/common/policy.py b/heat/common/policy.py
index 7d6b56499..6c547c852 100644
--- a/heat/common/policy.py
+++ b/heat/common/policy.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2011 OpenStack, LLC.
+# Copyright (c) 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/tests/test_auth_password.py b/heat/tests/test_auth_password.py
index 75a99a365..b9f9d995c 100644
--- a/heat/tests/test_auth_password.py
+++ b/heat/tests/test_auth_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.
diff --git a/heat/tests/test_common_policy.py b/heat/tests/test_common_policy.py
index ac3ca0a3d..0fd9ba9df 100644
--- a/heat/tests/test_common_policy.py
+++ b/heat/tests/test_common_policy.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/heat/tests/test_exception.py b/heat/tests/test_exception.py
index 520e029ae..03b1f9930 100644
--- a/heat/tests/test_exception.py
+++ b/heat/tests/test_exception.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/heat/tests/test_wsgi.py b/heat/tests/test_wsgi.py
index 843d88f0e..8de268ed9 100644
--- a/heat/tests/test_wsgi.py
+++ b/heat/tests/test_wsgi.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010-2011 OpenStack, LLC
+# Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/heat/tests/v1_1/fakes.py b/heat/tests/v1_1/fakes.py
index 57a07484b..426b53cb4 100644
--- a/heat/tests/v1_1/fakes.py
+++ b/heat/tests/v1_1/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.