diff --git a/bin/reddwarf-api b/bin/reddwarf-api
index 2f443ea513..029f54dfc3 100755
--- a/bin/reddwarf-api
+++ b/bin/reddwarf-api
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/bin/reddwarf-cli b/bin/reddwarf-cli
index ff591e46a5..0641507638 100755
--- a/bin/reddwarf-cli
+++ b/bin/reddwarf-cli
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-#    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. You may obtain
diff --git a/bin/reddwarf-guestagent b/bin/reddwarf-guestagent
index e8eed7666d..2dd53258cb 100755
--- a/bin/reddwarf-guestagent
+++ b/bin/reddwarf-guestagent
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/bin/reddwarf-manage b/bin/reddwarf-manage
index d2d5960c92..561c14670c 100755
--- a/bin/reddwarf-manage
+++ b/bin/reddwarf-manage
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/bin/reddwarf-mgmt-taskmanager b/bin/reddwarf-mgmt-taskmanager
index 2a3dbbdd08..a8c1a3d90f 100644
--- a/bin/reddwarf-mgmt-taskmanager
+++ b/bin/reddwarf-mgmt-taskmanager
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/bin/reddwarf-server b/bin/reddwarf-server
index 46b8a5980b..5cee185d48 100755
--- a/bin/reddwarf-server
+++ b/bin/reddwarf-server
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/bin/reddwarf-taskmanager b/bin/reddwarf-taskmanager
index 69e4a766c7..5864f50238 100755
--- a/bin/reddwarf-taskmanager
+++ b/bin/reddwarf-taskmanager
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/contrib/dbaas-mycnf/debian/copyright b/contrib/dbaas-mycnf/debian/copyright
index 3de65cf961..84f7c0161c 100644
--- a/contrib/dbaas-mycnf/debian/copyright
+++ b/contrib/dbaas-mycnf/debian/copyright
@@ -3,7 +3,7 @@ Name: dbaas-mycnf
 Source: local
 
 Files: *
-Copyright: 2010 OpenStack LLC
+Copyright: 2010 OpenStack Foundation
 Copyright: Others (See individual files for more details)
 License: Apache-2
  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/reddwarf/__init__.py b/reddwarf/__init__.py
index 5a275247dd..4865a1ed7a 100644
--- a/reddwarf/__init__.py
+++ b/reddwarf/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/common/__init__.py b/reddwarf/common/__init__.py
index d65c689a83..4dec227c40 100644
--- a/reddwarf/common/__init__.py
+++ b/reddwarf/common/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/common/api.py b/reddwarf/common/api.py
index 3bc2ab5054..3c14581af8 100644
--- a/reddwarf/common/api.py
+++ b/reddwarf/common/api.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/reddwarf/common/auth.py b/reddwarf/common/auth.py
index 6bc548fc24..7c748e0f8a 100644
--- a/reddwarf/common/auth.py
+++ b/reddwarf/common/auth.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/common/cfg.py b/reddwarf/common/cfg.py
index 679d9c1854..499bb1e881 100644
--- a/reddwarf/common/cfg.py
+++ b/reddwarf/common/cfg.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/common/context.py b/reddwarf/common/context.py
index 1578fe2b2d..efabf61b75 100644
--- a/reddwarf/common/context.py
+++ b/reddwarf/common/context.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/common/exception.py b/reddwarf/common/exception.py
index 6fa52ca1b1..c9c06ce897 100644
--- a/reddwarf/common/exception.py
+++ b/reddwarf/common/exception.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/common/extensions.py b/reddwarf/common/extensions.py
index 5db446d418..761bbd6270 100644
--- a/reddwarf/common/extensions.py
+++ b/reddwarf/common/extensions.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/common/limits.py b/reddwarf/common/limits.py
index 2f830562f8..56289dd591 100644
--- a/reddwarf/common/limits.py
+++ b/reddwarf/common/limits.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/common/manager.py b/reddwarf/common/manager.py
index cab359ef0f..00c6f7fc47 100644
--- a/reddwarf/common/manager.py
+++ b/reddwarf/common/manager.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/reddwarf/common/models.py b/reddwarf/common/models.py
index f80c950337..f294dad398 100644
--- a/reddwarf/common/models.py
+++ b/reddwarf/common/models.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/reddwarf/common/pagination.py b/reddwarf/common/pagination.py
index c5ee8217e2..38a29318a8 100644
--- a/reddwarf/common/pagination.py
+++ b/reddwarf/common/pagination.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/common/remote.py b/reddwarf/common/remote.py
index f3333192da..c9ab027705 100644
--- a/reddwarf/common/remote.py
+++ b/reddwarf/common/remote.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010-2012 OpenStack LLC.
+# Copyright 2010-2012 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/common/rpc.py b/reddwarf/common/rpc.py
index 3c1a94162f..a31ecd0417 100644
--- a/reddwarf/common/rpc.py
+++ b/reddwarf/common/rpc.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/common/utils.py b/reddwarf/common/utils.py
index 4635376a76..e9a97529d1 100644
--- a/reddwarf/common/utils.py
+++ b/reddwarf/common/utils.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/common/views.py b/reddwarf/common/views.py
index e133323da6..e91c936e2b 100644
--- a/reddwarf/common/views.py
+++ b/reddwarf/common/views.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/reddwarf/common/wsgi.py b/reddwarf/common/wsgi.py
index c8f6591754..a3cdedb299 100644
--- a/reddwarf/common/wsgi.py
+++ b/reddwarf/common/wsgi.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/db/__init__.py b/reddwarf/db/__init__.py
index 63b5091292..3717568fd0 100644
--- a/reddwarf/db/__init__.py
+++ b/reddwarf/db/__init__.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/reddwarf/db/models.py b/reddwarf/db/models.py
index bf7bde82f7..8d65672eae 100644
--- a/reddwarf/db/models.py
+++ b/reddwarf/db/models.py
@@ -1,4 +1,4 @@
-#    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. You may obtain
diff --git a/reddwarf/db/sqlalchemy/__init__.py b/reddwarf/db/sqlalchemy/__init__.py
index b60695702c..c43a9000aa 100644
--- a/reddwarf/db/sqlalchemy/__init__.py
+++ b/reddwarf/db/sqlalchemy/__init__.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/reddwarf/db/sqlalchemy/api.py b/reddwarf/db/sqlalchemy/api.py
index f9e3f592ff..6483b0eb0a 100644
--- a/reddwarf/db/sqlalchemy/api.py
+++ b/reddwarf/db/sqlalchemy/api.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/db/sqlalchemy/mappers.py b/reddwarf/db/sqlalchemy/mappers.py
index 5055ce38bf..3b4a885374 100644
--- a/reddwarf/db/sqlalchemy/mappers.py
+++ b/reddwarf/db/sqlalchemy/mappers.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/db/sqlalchemy/migrate_repo/__init__.py b/reddwarf/db/sqlalchemy/migrate_repo/__init__.py
index d65c689a83..4dec227c40 100644
--- a/reddwarf/db/sqlalchemy/migrate_repo/__init__.py
+++ b/reddwarf/db/sqlalchemy/migrate_repo/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/db/sqlalchemy/migrate_repo/manage.py b/reddwarf/db/sqlalchemy/migrate_repo/manage.py
index 84bf4d6cb9..1654260f10 100644
--- a/reddwarf/db/sqlalchemy/migrate_repo/manage.py
+++ b/reddwarf/db/sqlalchemy/migrate_repo/manage.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/db/sqlalchemy/migrate_repo/schema.py b/reddwarf/db/sqlalchemy/migrate_repo/schema.py
index 6dbeea2f0a..1d112c73de 100644
--- a/reddwarf/db/sqlalchemy/migrate_repo/schema.py
+++ b/reddwarf/db/sqlalchemy/migrate_repo/schema.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/db/sqlalchemy/migrate_repo/versions/001_base_schema.py b/reddwarf/db/sqlalchemy/migrate_repo/versions/001_base_schema.py
index 9ccae9b6c8..bd748895dc 100644
--- a/reddwarf/db/sqlalchemy/migrate_repo/versions/001_base_schema.py
+++ b/reddwarf/db/sqlalchemy/migrate_repo/versions/001_base_schema.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/db/sqlalchemy/migrate_repo/versions/002_service_images.py b/reddwarf/db/sqlalchemy/migrate_repo/versions/002_service_images.py
index bd1c15d823..7728babf59 100644
--- a/reddwarf/db/sqlalchemy/migrate_repo/versions/002_service_images.py
+++ b/reddwarf/db/sqlalchemy/migrate_repo/versions/002_service_images.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/db/sqlalchemy/migrate_repo/versions/003_service_statuses.py b/reddwarf/db/sqlalchemy/migrate_repo/versions/003_service_statuses.py
index be7dcfa7c8..12c15ae1ab 100644
--- a/reddwarf/db/sqlalchemy/migrate_repo/versions/003_service_statuses.py
+++ b/reddwarf/db/sqlalchemy/migrate_repo/versions/003_service_statuses.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/db/sqlalchemy/migrate_repo/versions/004_root_enabled.py b/reddwarf/db/sqlalchemy/migrate_repo/versions/004_root_enabled.py
index 3fde2bacdf..50a8fb3639 100644
--- a/reddwarf/db/sqlalchemy/migrate_repo/versions/004_root_enabled.py
+++ b/reddwarf/db/sqlalchemy/migrate_repo/versions/004_root_enabled.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=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/reddwarf/db/sqlalchemy/migrate_repo/versions/005_heartbeat.py b/reddwarf/db/sqlalchemy/migrate_repo/versions/005_heartbeat.py
index a61f501aa2..ac5ab9c4b2 100644
--- a/reddwarf/db/sqlalchemy/migrate_repo/versions/005_heartbeat.py
+++ b/reddwarf/db/sqlalchemy/migrate_repo/versions/005_heartbeat.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/db/sqlalchemy/migrate_repo/versions/006_dns_records.py b/reddwarf/db/sqlalchemy/migrate_repo/versions/006_dns_records.py
index 6b7af14b3b..b41f606ced 100644
--- a/reddwarf/db/sqlalchemy/migrate_repo/versions/006_dns_records.py
+++ b/reddwarf/db/sqlalchemy/migrate_repo/versions/006_dns_records.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/db/sqlalchemy/migrate_repo/versions/007_add_volume_flavor.py b/reddwarf/db/sqlalchemy/migrate_repo/versions/007_add_volume_flavor.py
index 05da6db9ce..9769da837f 100644
--- a/reddwarf/db/sqlalchemy/migrate_repo/versions/007_add_volume_flavor.py
+++ b/reddwarf/db/sqlalchemy/migrate_repo/versions/007_add_volume_flavor.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/reddwarf/db/sqlalchemy/migrate_repo/versions/008_add_instance_fields.py b/reddwarf/db/sqlalchemy/migrate_repo/versions/008_add_instance_fields.py
index 037292b372..5944e9d2e6 100644
--- a/reddwarf/db/sqlalchemy/migrate_repo/versions/008_add_instance_fields.py
+++ b/reddwarf/db/sqlalchemy/migrate_repo/versions/008_add_instance_fields.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/reddwarf/db/sqlalchemy/migrate_repo/versions/009_add_deleted_flag_to_instances.py b/reddwarf/db/sqlalchemy/migrate_repo/versions/009_add_deleted_flag_to_instances.py
index 5b19d8fb68..fa0651e9bb 100644
--- a/reddwarf/db/sqlalchemy/migrate_repo/versions/009_add_deleted_flag_to_instances.py
+++ b/reddwarf/db/sqlalchemy/migrate_repo/versions/009_add_deleted_flag_to_instances.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/reddwarf/db/sqlalchemy/migrate_repo/versions/010_add_usage.py b/reddwarf/db/sqlalchemy/migrate_repo/versions/010_add_usage.py
index b3d5bfd00f..041eeaca06 100644
--- a/reddwarf/db/sqlalchemy/migrate_repo/versions/010_add_usage.py
+++ b/reddwarf/db/sqlalchemy/migrate_repo/versions/010_add_usage.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/db/sqlalchemy/migrate_repo/versions/013_add_security_group_artifacts.py b/reddwarf/db/sqlalchemy/migrate_repo/versions/013_add_security_group_artifacts.py
index cd1e450674..6a1fd63807 100644
--- a/reddwarf/db/sqlalchemy/migrate_repo/versions/013_add_security_group_artifacts.py
+++ b/reddwarf/db/sqlalchemy/migrate_repo/versions/013_add_security_group_artifacts.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/db/sqlalchemy/migrate_repo/versions/__init__.py b/reddwarf/db/sqlalchemy/migrate_repo/versions/__init__.py
index e5e8b3743b..026c18eacb 100644
--- a/reddwarf/db/sqlalchemy/migrate_repo/versions/__init__.py
+++ b/reddwarf/db/sqlalchemy/migrate_repo/versions/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/db/sqlalchemy/migration.py b/reddwarf/db/sqlalchemy/migration.py
index d653e53cbb..7ebb9ab3c9 100644
--- a/reddwarf/db/sqlalchemy/migration.py
+++ b/reddwarf/db/sqlalchemy/migration.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/db/sqlalchemy/session.py b/reddwarf/db/sqlalchemy/session.py
index 5e2f0aeb8b..608272dd45 100644
--- a/reddwarf/db/sqlalchemy/session.py
+++ b/reddwarf/db/sqlalchemy/session.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/dns/models.py b/reddwarf/dns/models.py
index 97cb6ee945..354ac5583f 100644
--- a/reddwarf/dns/models.py
+++ b/reddwarf/dns/models.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/reddwarf/extensions/__init__.py b/reddwarf/extensions/__init__.py
index d65c689a83..4dec227c40 100644
--- a/reddwarf/extensions/__init__.py
+++ b/reddwarf/extensions/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/extensions/account.py b/reddwarf/extensions/account.py
index 89184f7005..4a3339800d 100644
--- a/reddwarf/extensions/account.py
+++ b/reddwarf/extensions/account.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/reddwarf/extensions/account/__init__.py b/reddwarf/extensions/account/__init__.py
index 63c3905e26..bf3075ddd8 100644
--- a/reddwarf/extensions/account/__init__.py
+++ b/reddwarf/extensions/account/__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/reddwarf/extensions/account/models.py b/reddwarf/extensions/account/models.py
index 5d283710cd..829fe5472b 100644
--- a/reddwarf/extensions/account/models.py
+++ b/reddwarf/extensions/account/models.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/reddwarf/extensions/account/service.py b/reddwarf/extensions/account/service.py
index 39a7275040..dccc3898cb 100644
--- a/reddwarf/extensions/account/service.py
+++ b/reddwarf/extensions/account/service.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/reddwarf/extensions/account/views.py b/reddwarf/extensions/account/views.py
index 5220956eca..a55e7ac9de 100644
--- a/reddwarf/extensions/account/views.py
+++ b/reddwarf/extensions/account/views.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/reddwarf/extensions/mgmt.py b/reddwarf/extensions/mgmt.py
index f2c3d679fc..7be3ccd72f 100644
--- a/reddwarf/extensions/mgmt.py
+++ b/reddwarf/extensions/mgmt.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/extensions/mgmt/__init__.py b/reddwarf/extensions/mgmt/__init__.py
index d65c689a83..4dec227c40 100644
--- a/reddwarf/extensions/mgmt/__init__.py
+++ b/reddwarf/extensions/mgmt/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/extensions/mgmt/host/__init__.py b/reddwarf/extensions/mgmt/host/__init__.py
index cbf4a45060..0b3d2db5e9 100644
--- a/reddwarf/extensions/mgmt/host/__init__.py
+++ b/reddwarf/extensions/mgmt/host/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=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/reddwarf/extensions/mgmt/host/instance/__init__.py b/reddwarf/extensions/mgmt/host/instance/__init__.py
index cbf4a45060..0b3d2db5e9 100644
--- a/reddwarf/extensions/mgmt/host/instance/__init__.py
+++ b/reddwarf/extensions/mgmt/host/instance/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=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/reddwarf/extensions/mgmt/host/instance/service.py b/reddwarf/extensions/mgmt/host/instance/service.py
index 562a363347..b2f2334c76 100644
--- a/reddwarf/extensions/mgmt/host/instance/service.py
+++ b/reddwarf/extensions/mgmt/host/instance/service.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=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/reddwarf/extensions/mgmt/host/models.py b/reddwarf/extensions/mgmt/host/models.py
index 135a8826f3..6cf246a1e8 100644
--- a/reddwarf/extensions/mgmt/host/models.py
+++ b/reddwarf/extensions/mgmt/host/models.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=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/reddwarf/extensions/mgmt/host/service.py b/reddwarf/extensions/mgmt/host/service.py
index 475cca03e7..0097979659 100644
--- a/reddwarf/extensions/mgmt/host/service.py
+++ b/reddwarf/extensions/mgmt/host/service.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/extensions/mgmt/host/views.py b/reddwarf/extensions/mgmt/host/views.py
index 3dbb61f53f..01e20bdbb6 100644
--- a/reddwarf/extensions/mgmt/host/views.py
+++ b/reddwarf/extensions/mgmt/host/views.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/extensions/mgmt/instances/__init__.py b/reddwarf/extensions/mgmt/instances/__init__.py
index cbf4a45060..0b3d2db5e9 100644
--- a/reddwarf/extensions/mgmt/instances/__init__.py
+++ b/reddwarf/extensions/mgmt/instances/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=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/reddwarf/extensions/mgmt/instances/models.py b/reddwarf/extensions/mgmt/instances/models.py
index 0143932089..5739650860 100644
--- a/reddwarf/extensions/mgmt/instances/models.py
+++ b/reddwarf/extensions/mgmt/instances/models.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/reddwarf/extensions/mgmt/instances/service.py b/reddwarf/extensions/mgmt/instances/service.py
index 9b9af480ed..cc5f7fd55e 100644
--- a/reddwarf/extensions/mgmt/instances/service.py
+++ b/reddwarf/extensions/mgmt/instances/service.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/extensions/mgmt/instances/views.py b/reddwarf/extensions/mgmt/instances/views.py
index 6caf15882d..fda4070e8d 100644
--- a/reddwarf/extensions/mgmt/instances/views.py
+++ b/reddwarf/extensions/mgmt/instances/views.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/extensions/mgmt/quota/__init__.py b/reddwarf/extensions/mgmt/quota/__init__.py
index cbf4a45060..0b3d2db5e9 100644
--- a/reddwarf/extensions/mgmt/quota/__init__.py
+++ b/reddwarf/extensions/mgmt/quota/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=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/reddwarf/extensions/mgmt/quota/service.py b/reddwarf/extensions/mgmt/quota/service.py
index 9245eb81bf..038439c704 100644
--- a/reddwarf/extensions/mgmt/quota/service.py
+++ b/reddwarf/extensions/mgmt/quota/service.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/extensions/mgmt/quota/views.py b/reddwarf/extensions/mgmt/quota/views.py
index 28d7547b77..c7c8b033be 100644
--- a/reddwarf/extensions/mgmt/quota/views.py
+++ b/reddwarf/extensions/mgmt/quota/views.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/extensions/mgmt/volume/__init__.py b/reddwarf/extensions/mgmt/volume/__init__.py
index cbf4a45060..0b3d2db5e9 100644
--- a/reddwarf/extensions/mgmt/volume/__init__.py
+++ b/reddwarf/extensions/mgmt/volume/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=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/reddwarf/extensions/mgmt/volume/models.py b/reddwarf/extensions/mgmt/volume/models.py
index 7ccc2608e0..3a35d50f7f 100644
--- a/reddwarf/extensions/mgmt/volume/models.py
+++ b/reddwarf/extensions/mgmt/volume/models.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=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/reddwarf/extensions/mgmt/volume/service.py b/reddwarf/extensions/mgmt/volume/service.py
index dad84348e6..34a9b4ef18 100644
--- a/reddwarf/extensions/mgmt/volume/service.py
+++ b/reddwarf/extensions/mgmt/volume/service.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/extensions/mgmt/volume/views.py b/reddwarf/extensions/mgmt/volume/views.py
index 4ecd677f40..064dae69dc 100644
--- a/reddwarf/extensions/mgmt/volume/views.py
+++ b/reddwarf/extensions/mgmt/volume/views.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/extensions/mysql.py b/reddwarf/extensions/mysql.py
index c452ab1da8..2b80d3b419 100644
--- a/reddwarf/extensions/mysql.py
+++ b/reddwarf/extensions/mysql.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/extensions/mysql/__init__.py b/reddwarf/extensions/mysql/__init__.py
index d65c689a83..4dec227c40 100644
--- a/reddwarf/extensions/mysql/__init__.py
+++ b/reddwarf/extensions/mysql/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/extensions/mysql/common.py b/reddwarf/extensions/mysql/common.py
index 17c8cbac3b..b4059ffec3 100644
--- a/reddwarf/extensions/mysql/common.py
+++ b/reddwarf/extensions/mysql/common.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/reddwarf/extensions/mysql/models.py b/reddwarf/extensions/mysql/models.py
index f27bb5aafd..c03617b79d 100644
--- a/reddwarf/extensions/mysql/models.py
+++ b/reddwarf/extensions/mysql/models.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/reddwarf/extensions/mysql/service.py b/reddwarf/extensions/mysql/service.py
index 1fdf66f15c..d81a715d68 100644
--- a/reddwarf/extensions/mysql/service.py
+++ b/reddwarf/extensions/mysql/service.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/extensions/mysql/views.py b/reddwarf/extensions/mysql/views.py
index a7535f552c..7ebdc4e6fc 100644
--- a/reddwarf/extensions/mysql/views.py
+++ b/reddwarf/extensions/mysql/views.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/flavor/__init__.py b/reddwarf/flavor/__init__.py
index cbf4a45060..0b3d2db5e9 100644
--- a/reddwarf/flavor/__init__.py
+++ b/reddwarf/flavor/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=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/reddwarf/flavor/models.py b/reddwarf/flavor/models.py
index df1a1f41b6..5db4858247 100644
--- a/reddwarf/flavor/models.py
+++ b/reddwarf/flavor/models.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010-2012 OpenStack LLC.
+# Copyright 2010-2012 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/flavor/service.py b/reddwarf/flavor/service.py
index bdc3bc25e3..9e07972f6c 100644
--- a/reddwarf/flavor/service.py
+++ b/reddwarf/flavor/service.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010-2012 OpenStack LLC.
+# Copyright 2010-2012 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/flavor/views.py b/reddwarf/flavor/views.py
index fcf49d8aad..94d8b1544c 100644
--- a/reddwarf/flavor/views.py
+++ b/reddwarf/flavor/views.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010-2012 OpenStack LLC.
+# Copyright 2010-2012 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/guestagent/models.py b/reddwarf/guestagent/models.py
index 275d0b91f8..6b0a902c37 100644
--- a/reddwarf/guestagent/models.py
+++ b/reddwarf/guestagent/models.py
@@ -1,4 +1,4 @@
-#    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. You may obtain
diff --git a/reddwarf/guestagent/service.py b/reddwarf/guestagent/service.py
index 5d096e62cd..0bce4aeeaf 100644
--- a/reddwarf/guestagent/service.py
+++ b/reddwarf/guestagent/service.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/instance/__init__.py b/reddwarf/instance/__init__.py
index d65c689a83..4dec227c40 100644
--- a/reddwarf/instance/__init__.py
+++ b/reddwarf/instance/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/instance/models.py b/reddwarf/instance/models.py
index 16b22281ba..f672a673e7 100644
--- a/reddwarf/instance/models.py
+++ b/reddwarf/instance/models.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/reddwarf/instance/service.py b/reddwarf/instance/service.py
index a1094aaf18..f0e948dbf9 100644
--- a/reddwarf/instance/service.py
+++ b/reddwarf/instance/service.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/instance/tasks.py b/reddwarf/instance/tasks.py
index 815e15a807..4053b79097 100644
--- a/reddwarf/instance/tasks.py
+++ b/reddwarf/instance/tasks.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/reddwarf/instance/views.py b/reddwarf/instance/views.py
index d0bca37b99..4969699182 100644
--- a/reddwarf/instance/views.py
+++ b/reddwarf/instance/views.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/limits/service.py b/reddwarf/limits/service.py
index 88e651a018..eb90b5a504 100644
--- a/reddwarf/limits/service.py
+++ b/reddwarf/limits/service.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2013 OpenStack LLC
+# Copyright 2013 OpenStack Foundation
 # Copyright 2013 Hewlett-Packard Development Company, L.P.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/limits/views.py b/reddwarf/limits/views.py
index db4840043e..6423809c89 100644
--- a/reddwarf/limits/views.py
+++ b/reddwarf/limits/views.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2013 OpenStack LLC.
+# Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/openstack/__init__.py b/reddwarf/openstack/__init__.py
index d65c689a83..4dec227c40 100644
--- a/reddwarf/openstack/__init__.py
+++ b/reddwarf/openstack/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/openstack/common/middleware/context.py b/reddwarf/openstack/common/middleware/context.py
index 05294d48a6..7a586c1c8e 100644
--- a/reddwarf/openstack/common/middleware/context.py
+++ b/reddwarf/openstack/common/middleware/context.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/openstack/common/notifier/__init__.py b/reddwarf/openstack/common/notifier/__init__.py
index 482d54e4fd..31285c4fc2 100644
--- a/reddwarf/openstack/common/notifier/__init__.py
+++ b/reddwarf/openstack/common/notifier/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/openstack/common/notifier/api.py b/reddwarf/openstack/common/notifier/api.py
index 1ac0906b95..304a65a11a 100644
--- a/reddwarf/openstack/common/notifier/api.py
+++ b/reddwarf/openstack/common/notifier/api.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/openstack/common/notifier/log_notifier.py b/reddwarf/openstack/common/notifier/log_notifier.py
index 24919e1db5..9b0b02dfa7 100644
--- a/reddwarf/openstack/common/notifier/log_notifier.py
+++ b/reddwarf/openstack/common/notifier/log_notifier.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/openstack/common/notifier/no_op_notifier.py b/reddwarf/openstack/common/notifier/no_op_notifier.py
index ee1ddbdcac..d22d02072e 100644
--- a/reddwarf/openstack/common/notifier/no_op_notifier.py
+++ b/reddwarf/openstack/common/notifier/no_op_notifier.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/openstack/common/notifier/rpc_notifier.py b/reddwarf/openstack/common/notifier/rpc_notifier.py
index 873e20c748..48bb57e2c2 100644
--- a/reddwarf/openstack/common/notifier/rpc_notifier.py
+++ b/reddwarf/openstack/common/notifier/rpc_notifier.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/openstack/common/notifier/test_notifier.py b/reddwarf/openstack/common/notifier/test_notifier.py
index 5e348803dc..2e392f8b90 100644
--- a/reddwarf/openstack/common/notifier/test_notifier.py
+++ b/reddwarf/openstack/common/notifier/test_notifier.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/openstack/common/rpc/impl_fake.py b/reddwarf/openstack/common/rpc/impl_fake.py
index dbe661a5b1..6a21693566 100644
--- a/reddwarf/openstack/common/rpc/impl_fake.py
+++ b/reddwarf/openstack/common/rpc/impl_fake.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-#    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. You may obtain
diff --git a/reddwarf/openstack/common/rpc/impl_kombu.py b/reddwarf/openstack/common/rpc/impl_kombu.py
index 9fc099fa74..4e543b0452 100644
--- a/reddwarf/openstack/common/rpc/impl_kombu.py
+++ b/reddwarf/openstack/common/rpc/impl_kombu.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-#    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. You may obtain
diff --git a/reddwarf/openstack/common/rpc/impl_qpid.py b/reddwarf/openstack/common/rpc/impl_qpid.py
index c8435d63ce..bdc6282555 100644
--- a/reddwarf/openstack/common/rpc/impl_qpid.py
+++ b/reddwarf/openstack/common/rpc/impl_qpid.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-#    Copyright 2011 OpenStack LLC
+#    Copyright 2011 OpenStack Foundation
 #    Copyright 2011 - 2012, Red Hat, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/quota/__init__.py b/reddwarf/quota/__init__.py
index d65c689a83..4dec227c40 100644
--- a/reddwarf/quota/__init__.py
+++ b/reddwarf/quota/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/quota/models.py b/reddwarf/quota/models.py
index f58e084e5d..c947f07dcf 100644
--- a/reddwarf/quota/models.py
+++ b/reddwarf/quota/models.py
@@ -1,4 +1,4 @@
-#    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. You may obtain
diff --git a/reddwarf/quota/quota.py b/reddwarf/quota/quota.py
index 3a7d1d9086..48219724e7 100644
--- a/reddwarf/quota/quota.py
+++ b/reddwarf/quota/quota.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/taskmanager/__init__.py b/reddwarf/taskmanager/__init__.py
index d65c689a83..4dec227c40 100644
--- a/reddwarf/taskmanager/__init__.py
+++ b/reddwarf/taskmanager/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/taskmanager/api.py b/reddwarf/taskmanager/api.py
index 0ff204badb..8de5d73276 100644
--- a/reddwarf/taskmanager/api.py
+++ b/reddwarf/taskmanager/api.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/reddwarf/taskmanager/manager.py b/reddwarf/taskmanager/manager.py
index b93059e3b6..cbdb0f01e0 100644
--- a/reddwarf/taskmanager/manager.py
+++ b/reddwarf/taskmanager/manager.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/taskmanager/models.py b/reddwarf/taskmanager/models.py
index cb830d788f..30023b5202 100644
--- a/reddwarf/taskmanager/models.py
+++ b/reddwarf/taskmanager/models.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/reddwarf/taskmanager/service.py b/reddwarf/taskmanager/service.py
index 3a6a152950..a2a44c0f25 100644
--- a/reddwarf/taskmanager/service.py
+++ b/reddwarf/taskmanager/service.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/tests/api/__init__.py b/reddwarf/tests/api/__init__.py
index 40d014dd8b..6de9fac497 100644
--- a/reddwarf/tests/api/__init__.py
+++ b/reddwarf/tests/api/__init__.py
@@ -1,4 +1,4 @@
-#    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. You may obtain
diff --git a/reddwarf/tests/api/databases.py b/reddwarf/tests/api/databases.py
index cdaf2b0535..7ca4713ae9 100644
--- a/reddwarf/tests/api/databases.py
+++ b/reddwarf/tests/api/databases.py
@@ -1,4 +1,4 @@
-#    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. You may obtain
diff --git a/reddwarf/tests/api/instances.py b/reddwarf/tests/api/instances.py
index a41eaedf5b..e6ed957a6f 100644
--- a/reddwarf/tests/api/instances.py
+++ b/reddwarf/tests/api/instances.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/tests/api/instances_actions.py b/reddwarf/tests/api/instances_actions.py
index 09ef61cb01..4e71c55a08 100644
--- a/reddwarf/tests/api/instances_actions.py
+++ b/reddwarf/tests/api/instances_actions.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/tests/api/instances_mysql_down.py b/reddwarf/tests/api/instances_mysql_down.py
index e94e13bf67..f7db4fbc2f 100644
--- a/reddwarf/tests/api/instances_mysql_down.py
+++ b/reddwarf/tests/api/instances_mysql_down.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/reddwarf/tests/api/instances_resize.py b/reddwarf/tests/api/instances_resize.py
index bc53b2904c..273a660ee0 100644
--- a/reddwarf/tests/api/instances_resize.py
+++ b/reddwarf/tests/api/instances_resize.py
@@ -1,4 +1,4 @@
-# Copyright 2013 OpenStack LLC.
+# Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/tests/api/mgmt/__init__.py b/reddwarf/tests/api/mgmt/__init__.py
index 40d014dd8b..6de9fac497 100644
--- a/reddwarf/tests/api/mgmt/__init__.py
+++ b/reddwarf/tests/api/mgmt/__init__.py
@@ -1,4 +1,4 @@
-#    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. You may obtain
diff --git a/reddwarf/tests/api/mgmt/accounts.py b/reddwarf/tests/api/mgmt/accounts.py
index 26e46c060c..703a3b9b59 100644
--- a/reddwarf/tests/api/mgmt/accounts.py
+++ b/reddwarf/tests/api/mgmt/accounts.py
@@ -1,4 +1,4 @@
-#    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. You may obtain
diff --git a/reddwarf/tests/api/mgmt/admin_required.py b/reddwarf/tests/api/mgmt/admin_required.py
index b57b87cbb3..3c2ce218ba 100644
--- a/reddwarf/tests/api/mgmt/admin_required.py
+++ b/reddwarf/tests/api/mgmt/admin_required.py
@@ -1,4 +1,4 @@
-#    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. You may obtain
diff --git a/reddwarf/tests/api/mgmt/instances.py b/reddwarf/tests/api/mgmt/instances.py
index 319c68f427..4f74155431 100644
--- a/reddwarf/tests/api/mgmt/instances.py
+++ b/reddwarf/tests/api/mgmt/instances.py
@@ -1,4 +1,4 @@
-#    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. You may obtain
diff --git a/reddwarf/tests/api/mgmt/instances_actions.py b/reddwarf/tests/api/mgmt/instances_actions.py
index 08e895727d..f3a869931a 100644
--- a/reddwarf/tests/api/mgmt/instances_actions.py
+++ b/reddwarf/tests/api/mgmt/instances_actions.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/reddwarf/tests/api/mgmt/storage.py b/reddwarf/tests/api/mgmt/storage.py
index 454408ea42..447b3b348a 100644
--- a/reddwarf/tests/api/mgmt/storage.py
+++ b/reddwarf/tests/api/mgmt/storage.py
@@ -1,4 +1,4 @@
-#    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. You may obtain
diff --git a/reddwarf/tests/api/root.py b/reddwarf/tests/api/root.py
index 473bbde5eb..b631f993b4 100644
--- a/reddwarf/tests/api/root.py
+++ b/reddwarf/tests/api/root.py
@@ -1,4 +1,4 @@
-#    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. You may obtain
diff --git a/reddwarf/tests/api/user_access.py b/reddwarf/tests/api/user_access.py
index 0570791047..68515c71b7 100644
--- a/reddwarf/tests/api/user_access.py
+++ b/reddwarf/tests/api/user_access.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/reddwarf/tests/api/users.py b/reddwarf/tests/api/users.py
index 4b0014cb1a..368f319f91 100644
--- a/reddwarf/tests/api/users.py
+++ b/reddwarf/tests/api/users.py
@@ -1,4 +1,4 @@
-#    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. You may obtain
diff --git a/reddwarf/tests/api/versions.py b/reddwarf/tests/api/versions.py
index 3cf3e5fa4b..9d318e368b 100644
--- a/reddwarf/tests/api/versions.py
+++ b/reddwarf/tests/api/versions.py
@@ -1,4 +1,4 @@
-#    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. You may obtain
diff --git a/reddwarf/tests/fakes/__init__.py b/reddwarf/tests/fakes/__init__.py
index f33b19b8c2..aca7f89f1f 100644
--- a/reddwarf/tests/fakes/__init__.py
+++ b/reddwarf/tests/fakes/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/tests/fakes/common.py b/reddwarf/tests/fakes/common.py
index d70a7088dc..6f1ed9e02a 100644
--- a/reddwarf/tests/fakes/common.py
+++ b/reddwarf/tests/fakes/common.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/reddwarf/tests/fakes/guestagent.py b/reddwarf/tests/fakes/guestagent.py
index 7bcacf0152..bb64124e61 100644
--- a/reddwarf/tests/fakes/guestagent.py
+++ b/reddwarf/tests/fakes/guestagent.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010-2012 OpenStack LLC.
+# Copyright 2010-2012 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/tests/fakes/keystone.py b/reddwarf/tests/fakes/keystone.py
index a20ac061fe..a9adc8856c 100644
--- a/reddwarf/tests/fakes/keystone.py
+++ b/reddwarf/tests/fakes/keystone.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010-2012 OpenStack LLC.
+# Copyright 2010-2012 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/tests/fakes/nova.py b/reddwarf/tests/fakes/nova.py
index 58947b9c29..c7dbd97c39 100644
--- a/reddwarf/tests/fakes/nova.py
+++ b/reddwarf/tests/fakes/nova.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010-2012 OpenStack LLC.
+# Copyright 2010-2012 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/tests/unittests/__init__.py b/reddwarf/tests/unittests/__init__.py
index 40d014dd8b..6de9fac497 100644
--- a/reddwarf/tests/unittests/__init__.py
+++ b/reddwarf/tests/unittests/__init__.py
@@ -1,4 +1,4 @@
-#    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. You may obtain
diff --git a/reddwarf/tests/unittests/api/__init__.py b/reddwarf/tests/unittests/api/__init__.py
index e7dd9b826d..88e653874c 100644
--- a/reddwarf/tests/unittests/api/__init__.py
+++ b/reddwarf/tests/unittests/api/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2013 OpenStack LLC.
+# Copyright 2013 OpenStack Foundation
 # Copyright 2013 Hewlett-Packard Development Company, L.P.
 # All Rights Reserved.
 #
diff --git a/reddwarf/tests/unittests/api/common/test_limits.py b/reddwarf/tests/unittests/api/common/test_limits.py
index bc762a52eb..cc4bc51db9 100644
--- a/reddwarf/tests/unittests/api/common/test_limits.py
+++ b/reddwarf/tests/unittests/api/common/test_limits.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/tests/unittests/api/test_versions.py b/reddwarf/tests/unittests/api/test_versions.py
index f3ea1330e4..35210ab147 100644
--- a/reddwarf/tests/unittests/api/test_versions.py
+++ b/reddwarf/tests/unittests/api/test_versions.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2013 OpenStack LLC
+# Copyright 2013 OpenStack Foundation
 # Copyright 2013 Hewlett-Packard Development Company, L.P.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/tests/unittests/guestagent/__init__.py b/reddwarf/tests/unittests/guestagent/__init__.py
index 40d014dd8b..6de9fac497 100644
--- a/reddwarf/tests/unittests/guestagent/__init__.py
+++ b/reddwarf/tests/unittests/guestagent/__init__.py
@@ -1,4 +1,4 @@
-#    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. You may obtain
diff --git a/reddwarf/tests/unittests/guestagent/test_api.py b/reddwarf/tests/unittests/guestagent/test_api.py
index fb8926b9a9..04318b50aa 100644
--- a/reddwarf/tests/unittests/guestagent/test_api.py
+++ b/reddwarf/tests/unittests/guestagent/test_api.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/reddwarf/tests/unittests/guestagent/test_dbaas.py b/reddwarf/tests/unittests/guestagent/test_dbaas.py
index 3b881b6d8f..4beeca0613 100644
--- a/reddwarf/tests/unittests/guestagent/test_dbaas.py
+++ b/reddwarf/tests/unittests/guestagent/test_dbaas.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/reddwarf/tests/unittests/guestagent/test_dbmodels.py b/reddwarf/tests/unittests/guestagent/test_dbmodels.py
index 90a33fce10..527171d783 100644
--- a/reddwarf/tests/unittests/guestagent/test_dbmodels.py
+++ b/reddwarf/tests/unittests/guestagent/test_dbmodels.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/reddwarf/tests/unittests/guestagent/test_manager.py b/reddwarf/tests/unittests/guestagent/test_manager.py
index d15278c700..781e36eda3 100644
--- a/reddwarf/tests/unittests/guestagent/test_manager.py
+++ b/reddwarf/tests/unittests/guestagent/test_manager.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/reddwarf/tests/unittests/guestagent/test_models.py b/reddwarf/tests/unittests/guestagent/test_models.py
index 734b8397fa..ed2f650a2a 100644
--- a/reddwarf/tests/unittests/guestagent/test_models.py
+++ b/reddwarf/tests/unittests/guestagent/test_models.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/reddwarf/tests/unittests/guestagent/test_query.py b/reddwarf/tests/unittests/guestagent/test_query.py
index 907fb26f2a..a4b8d701d1 100644
--- a/reddwarf/tests/unittests/guestagent/test_query.py
+++ b/reddwarf/tests/unittests/guestagent/test_query.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/reddwarf/tests/unittests/guestagent/test_service.py b/reddwarf/tests/unittests/guestagent/test_service.py
index 1b24c03b23..4b3aa3ff19 100644
--- a/reddwarf/tests/unittests/guestagent/test_service.py
+++ b/reddwarf/tests/unittests/guestagent/test_service.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/reddwarf/tests/unittests/guestagent/test_volume.py b/reddwarf/tests/unittests/guestagent/test_volume.py
index dffd5a9ce9..72f395a131 100644
--- a/reddwarf/tests/unittests/guestagent/test_volume.py
+++ b/reddwarf/tests/unittests/guestagent/test_volume.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/reddwarf/tests/unittests/quota/__init__.py b/reddwarf/tests/unittests/quota/__init__.py
index 40d014dd8b..6de9fac497 100644
--- a/reddwarf/tests/unittests/quota/__init__.py
+++ b/reddwarf/tests/unittests/quota/__init__.py
@@ -1,4 +1,4 @@
-#    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. You may obtain
diff --git a/reddwarf/tests/unittests/quota/test_quota.py b/reddwarf/tests/unittests/quota/test_quota.py
index ab38959898..b2b39aa512 100644
--- a/reddwarf/tests/unittests/quota/test_quota.py
+++ b/reddwarf/tests/unittests/quota/test_quota.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/reddwarf/tests/unittests/secgroups/__init__.py b/reddwarf/tests/unittests/secgroups/__init__.py
index d65c689a83..4dec227c40 100644
--- a/reddwarf/tests/unittests/secgroups/__init__.py
+++ b/reddwarf/tests/unittests/secgroups/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/tests/unittests/secgroups/test_security_group.py b/reddwarf/tests/unittests/secgroups/test_security_group.py
index c1b4600455..42049e4d44 100644
--- a/reddwarf/tests/unittests/secgroups/test_security_group.py
+++ b/reddwarf/tests/unittests/secgroups/test_security_group.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/reddwarf/tests/unittests/util/__init__.py b/reddwarf/tests/unittests/util/__init__.py
index 40d014dd8b..6de9fac497 100644
--- a/reddwarf/tests/unittests/util/__init__.py
+++ b/reddwarf/tests/unittests/util/__init__.py
@@ -1,4 +1,4 @@
-#    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. You may obtain
diff --git a/reddwarf/tests/unittests/util/util.py b/reddwarf/tests/unittests/util/util.py
index a96bc2dfe3..784d83c8da 100644
--- a/reddwarf/tests/unittests/util/util.py
+++ b/reddwarf/tests/unittests/util/util.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/reddwarf/tests/util/server_connection.py b/reddwarf/tests/util/server_connection.py
index 863404144e..1496b0a6ee 100644
--- a/reddwarf/tests/util/server_connection.py
+++ b/reddwarf/tests/util/server_connection.py
@@ -1,4 +1,4 @@
-# Copyright 2013 OpenStack LLC.
+# Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/version.py b/reddwarf/version.py
index 0cc9b3998d..04081a1b3a 100644
--- a/reddwarf/version.py
+++ b/reddwarf/version.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/reddwarf/versions.py b/reddwarf/versions.py
index 597a8c8464..97c2318907 100644
--- a/reddwarf/versions.py
+++ b/reddwarf/versions.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/rsdns/client/__init__.py b/rsdns/client/__init__.py
index 53e53633de..63a5e2364e 100644
--- a/rsdns/client/__init__.py
+++ b/rsdns/client/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/rsdns/client/dns_client.py b/rsdns/client/dns_client.py
index 54b50c985e..77013bc9af 100644
--- a/rsdns/client/dns_client.py
+++ b/rsdns/client/dns_client.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/rsdns/client/domains.py b/rsdns/client/domains.py
index f2f85abc0c..c69c44ebd4 100644
--- a/rsdns/client/domains.py
+++ b/rsdns/client/domains.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/rsdns/client/exceptions.py b/rsdns/client/exceptions.py
index 8f0d8f1521..8465ef330c 100644
--- a/rsdns/client/exceptions.py
+++ b/rsdns/client/exceptions.py
@@ -1,4 +1,4 @@
-#    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. You may obtain
diff --git a/rsdns/client/records.py b/rsdns/client/records.py
index d1f49a0b28..2a31740466 100644
--- a/rsdns/client/records.py
+++ b/rsdns/client/records.py
@@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may