diff --git a/doc/source/conf.py b/doc/source/conf.py
index 3d7efa7b5a..cb20c75470 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -68,7 +68,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'keystone'
-copyright = u'2012, OpenStack, LLC'
+copyright = u'2012, OpenStack Foundation'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/keystone/policy/backends/rules.py b/keystone/policy/backends/rules.py
index fa675d23d2..2a3a825659 100644
--- a/keystone/policy/backends/rules.py
+++ b/keystone/policy/backends/rules.py
@@ -1,4 +1,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/keystone/policy/backends/sql.py b/keystone/policy/backends/sql.py
index 94763f0d13..1ed9949c65 100644
--- a/keystone/policy/backends/sql.py
+++ b/keystone/policy/backends/sql.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/unit/test_v3_filters.py b/keystone/tests/unit/test_v3_filters.py
index c72d49d420..8e41cacd3e 100644
--- a/keystone/tests/unit/test_v3_filters.py
+++ b/keystone/tests/unit/test_v3_filters.py
@@ -1,4 +1,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