From 69652904bae60449d53ae44aa278a49c1bf9f061 Mon Sep 17 00:00:00 2001
From: Gary Kotton <gkotton@redhat.com>
Date: Wed, 13 Mar 2013 15:26:12 +0000
Subject: [PATCH] Replace "OpenStack LLC" with "OpenStack Foundation"

fixes bug 1154702

Change-Id: I78b1d2c9975a1a4f32b0785cce45f1e471783d8c
(cherry picked from commit e4b44c285685b7bfd2b4bef89d6a661958f44a20)
---
 bin/quantum-debug                                             | 2 +-
 bin/quantum-dhcp-agent                                        | 2 +-
 bin/quantum-dhcp-agent-dnsmasq-lease-update                   | 2 +-
 bin/quantum-l3-agent                                          | 2 +-
 bin/quantum-lbaas-agent                                       | 2 +-
 bin/quantum-metadata-agent                                    | 2 +-
 bin/quantum-netns-cleanup                                     | 2 +-
 bin/quantum-ns-metadata-proxy                                 | 2 +-
 bin/quantum-ovs-cleanup                                       | 2 +-
 bin/quantum-rootwrap                                          | 2 +-
 bin/quantum-rpc-zmq-receiver                                  | 2 +-
 doc/source/conf.py                                            | 4 ++--
 doc/source/docbkx/quantum-api-1.0/xsd/actions.xsd             | 2 +-
 doc/source/docbkx/quantum-api-1.0/xsd/api-common.xsd          | 2 +-
 doc/source/docbkx/quantum-api-1.0/xsd/api.xsd                 | 2 +-
 doc/source/docbkx/quantum-api-1.0/xsd/common.xsd              | 2 +-
 doc/source/docbkx/quantum-api-1.0/xsd/extensions.xsd          | 2 +-
 doc/source/docbkx/quantum-api-1.0/xsd/faults.xsd              | 2 +-
 doc/source/docbkx/quantum-api-1.0/xsd/flavor.xsd              | 2 +-
 doc/source/docbkx/quantum-api-1.0/xsd/image.xsd               | 2 +-
 doc/source/docbkx/quantum-api-1.0/xsd/limits.xsd              | 2 +-
 doc/source/docbkx/quantum-api-1.0/xsd/metadata.xsd            | 2 +-
 doc/source/docbkx/quantum-api-1.0/xsd/server.xsd              | 2 +-
 doc/source/docbkx/quantum-api-1.0/xsd/version.xsd             | 2 +-
 doc/source/index.rst                                          | 2 +-
 doc/source/man/quantum-server.rst                             | 2 +-
 quantum/__init__.py                                           | 2 +-
 quantum/agent/__init__.py                                     | 2 +-
 quantum/agent/common/__init__.py                              | 2 +-
 quantum/agent/common/config.py                                | 2 +-
 quantum/agent/dhcp_agent.py                                   | 2 +-
 quantum/agent/linux/__init__.py                               | 2 +-
 quantum/agent/linux/dhcp.py                                   | 2 +-
 quantum/agent/linux/interface.py                              | 2 +-
 quantum/agent/linux/ip_lib.py                                 | 2 +-
 quantum/agent/netns_cleanup_util.py                           | 2 +-
 quantum/agent/ovs_cleanup_util.py                             | 2 +-
 quantum/agent/rpc.py                                          | 2 +-
 quantum/api/extensions.py                                     | 2 +-
 quantum/api/rpc/__init__.py                                   | 2 +-
 quantum/api/rpc/agentnotifiers/__init__.py                    | 2 +-
 quantum/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py          | 2 +-
 quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py            | 2 +-
 quantum/api/v2/__init__.py                                    | 2 +-
 quantum/api/v2/attributes.py                                  | 2 +-
 quantum/api/v2/base.py                                        | 2 +-
 quantum/api/v2/resource.py                                    | 2 +-
 quantum/api/v2/router.py                                      | 2 +-
 quantum/api/views/versions.py                                 | 2 +-
 quantum/auth.py                                               | 2 +-
 quantum/common/constants.py                                   | 2 +-
 quantum/common/rpc.py                                         | 2 +-
 quantum/common/test_lib.py                                    | 2 +-
 quantum/common/topics.py                                      | 2 +-
 quantum/context.py                                            | 2 +-
 quantum/db/agents_db.py                                       | 2 +-
 quantum/db/agentschedulers_db.py                              | 2 +-
 quantum/db/db_base_plugin_v2.py                               | 2 +-
 quantum/db/dhcp_rpc_base.py                                   | 2 +-
 quantum/db/l3_rpc_base.py                                     | 2 +-
 quantum/db/loadbalancer/__init__.py                           | 2 +-
 quantum/db/loadbalancer/loadbalancer_db.py                    | 2 +-
 quantum/db/migration/alembic_migrations/common_ext_ops.py     | 2 +-
 quantum/db/migration/alembic_migrations/script.py.mako        | 2 +-
 .../alembic_migrations/versions/1149d7de0cfa_port_security.py | 2 +-
 .../versions/1341ed32cc1e_nvp_netbinding_update.py            | 2 +-
 .../versions/1b693c095aa3_quota_ext_db_grizzly.py             | 2 +-
 .../versions/1c33fa3cd1a1_extra_route_config.py               | 2 +-
 .../versions/1d76643bcec4_nvp_netbinding.py                   | 2 +-
 .../versions/2a6d0b51f4bb_cisco_plugin_cleanup.py             | 2 +-
 .../alembic_migrations/versions/2c4af419145b_l3_support.py    | 2 +-
 .../versions/363468ac592c_nvp_network_gw.py                   | 2 +-
 .../alembic_migrations/versions/38335592a0dc_nvp_portmap.py   | 2 +-
 .../versions/3b54bf9e29f7_nec_plugin_sharednet.py             | 2 +-
 .../versions/3cb5d900c5de_security_groups.py                  | 2 +-
 .../alembic_migrations/versions/45680af419f9_nvp_qos.py       | 2 +-
 .../versions/4692d074d587_agent_scheduler.py                  | 2 +-
 .../alembic_migrations/versions/48b6f43f7471_service_type.py  | 2 +-
 .../versions/49332180ca96_ryu_plugin_update.py                | 2 +-
 .../versions/511471cc46b_agent_ext_model_supp.py              | 2 +-
 .../alembic_migrations/versions/54c2c487e913_lbaas.py         | 2 +-
 .../migration/alembic_migrations/versions/grizzly_release.py  | 2 +-
 quantum/db/model_base.py                                      | 2 +-
 quantum/db/models_v2.py                                       | 2 +-
 quantum/db/quota_db.py                                        | 2 +-
 quantum/db/servicetype_db.py                                  | 2 +-
 quantum/db/sqlalchemyutils.py                                 | 2 +-
 quantum/extensions/__init__.py                                | 2 +-
 quantum/extensions/agent.py                                   | 2 +-
 quantum/extensions/agentscheduler.py                          | 2 +-
 quantum/extensions/loadbalancer.py                            | 2 +-
 quantum/extensions/portbindings.py                            | 2 +-
 quantum/extensions/providernet.py                             | 2 +-
 quantum/extensions/quotasv2.py                                | 2 +-
 quantum/extensions/securitygroup.py                           | 2 +-
 quantum/extensions/servicetype.py                             | 2 +-
 quantum/plugins/__init__.py                                   | 2 +-
 quantum/plugins/bigswitch/version.py                          | 2 +-
 quantum/plugins/cisco/extensions/__init__.py                  | 2 +-
 quantum/plugins/cisco/run_tests.py                            | 2 +-
 quantum/plugins/cisco/tests/unit/__init__.py                  | 2 +-
 quantum/plugins/cisco/tests/unit/test_cisco_extension.py      | 2 +-
 quantum/plugins/cisco/tests/unit/v2/__init__.py               | 2 +-
 quantum/plugins/cisco/tests/unit/v2/nexus/__init__.py         | 2 +-
 quantum/plugins/cisco/tests/unit/v2/test_api_v2.py            | 2 +-
 quantum/plugins/common/__init__.py                            | 2 +-
 quantum/plugins/common/constants.py                           | 2 +-
 quantum/plugins/linuxbridge/db/l2network_db_v2.py             | 2 +-
 quantum/plugins/linuxbridge/db/l2network_models_v2.py         | 2 +-
 quantum/plugins/linuxbridge/lb_quantum_plugin.py              | 2 +-
 quantum/plugins/metaplugin/run_tests.py                       | 2 +-
 quantum/plugins/openvswitch/common/constants.py               | 2 +-
 quantum/plugins/services/__init__.py                          | 2 +-
 quantum/plugins/services/agent_loadbalancer/__init__.py       | 2 +-
 quantum/plugins/services/agent_loadbalancer/plugin.py         | 2 +-
 quantum/plugins/services/service_base.py                      | 2 +-
 quantum/policy.py                                             | 2 +-
 quantum/quota.py                                              | 2 +-
 quantum/rootwrap/__init__.py                                  | 2 +-
 quantum/rootwrap/filters.py                                   | 2 +-
 quantum/rootwrap/wrapper.py                                   | 2 +-
 quantum/scheduler/__init__.py                                 | 2 +-
 quantum/scheduler/dhcp_agent_scheduler.py                     | 2 +-
 quantum/scheduler/l3_agent_scheduler.py                       | 2 +-
 quantum/tests/__init__.py                                     | 2 +-
 quantum/tests/base.py                                         | 2 +-
 quantum/tests/unit/__init__.py                                | 2 +-
 quantum/tests/unit/_test_rootwrap_exec.py                     | 2 +-
 quantum/tests/unit/bigswitch/__init__.py                      | 2 +-
 quantum/tests/unit/brocade/__init__.py                        | 2 +-
 quantum/tests/unit/brocade/test_brocade_db.py                 | 2 +-
 quantum/tests/unit/brocade/test_brocade_plugin.py             | 2 +-
 quantum/tests/unit/brocade/test_brocade_vlan.py               | 2 +-
 quantum/tests/unit/cisco/__init__.py                          | 2 +-
 quantum/tests/unit/cisco/test_network_plugin.py               | 2 +-
 quantum/tests/unit/cisco/test_nexus_plugin.py                 | 2 +-
 quantum/tests/unit/db/__init__.py                             | 2 +-
 quantum/tests/unit/db/loadbalancer/__init__.py                | 2 +-
 quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py    | 2 +-
 quantum/tests/unit/dummy_plugin.py                            | 2 +-
 quantum/tests/unit/extension_stubs.py                         | 2 +-
 quantum/tests/unit/extensions/__init__.py                     | 2 +-
 quantum/tests/unit/extensions/foxinsocks.py                   | 2 +-
 quantum/tests/unit/extensions/v2attributes.py                 | 2 +-
 quantum/tests/unit/linuxbridge/__init__.py                    | 2 +-
 quantum/tests/unit/linuxbridge/test_agent_scheduler.py        | 2 +-
 quantum/tests/unit/linuxbridge/test_defaults.py               | 2 +-
 quantum/tests/unit/linuxbridge/test_lb_db.py                  | 2 +-
 quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py       | 2 +-
 quantum/tests/unit/linuxbridge/test_linuxbridge_plugin.py     | 2 +-
 quantum/tests/unit/metaplugin/test_basic.py                   | 2 +-
 quantum/tests/unit/nec/test_nec_plugin.py                     | 2 +-
 quantum/tests/unit/nicira/__init__.py                         | 2 +-
 quantum/tests/unit/nicira/test_nicira_plugin.py               | 2 +-
 quantum/tests/unit/nicira/test_nvplib.py                      | 2 +-
 quantum/tests/unit/openvswitch/__init__.py                    | 2 +-
 quantum/tests/unit/openvswitch/test_agent_scheduler.py        | 2 +-
 quantum/tests/unit/openvswitch/test_openvswitch_plugin.py     | 2 +-
 quantum/tests/unit/openvswitch/test_ovs_db.py                 | 2 +-
 quantum/tests/unit/openvswitch/test_ovs_defaults.py           | 2 +-
 quantum/tests/unit/openvswitch/test_ovs_quantum_agent.py      | 2 +-
 quantum/tests/unit/ryu/__init__.py                            | 2 +-
 quantum/tests/unit/ryu/fake_ryu.py                            | 2 +-
 quantum/tests/unit/ryu/test_ryu_agent.py                      | 2 +-
 quantum/tests/unit/ryu/test_ryu_plugin.py                     | 2 +-
 quantum/tests/unit/services/agent_loadbalancer/test_plugin.py | 2 +-
 quantum/tests/unit/test_agent_config.py                       | 2 +-
 quantum/tests/unit/test_agent_ext_plugin.py                   | 2 +-
 quantum/tests/unit/test_agent_netns_cleanup.py                | 2 +-
 quantum/tests/unit/test_agent_ovs_cleanup.py                  | 2 +-
 quantum/tests/unit/test_agent_rpc.py                          | 2 +-
 quantum/tests/unit/test_api_v2.py                             | 2 +-
 quantum/tests/unit/test_attributes.py                         | 2 +-
 quantum/tests/unit/test_auth.py                               | 2 +-
 quantum/tests/unit/test_common_utils.py                       | 2 +-
 quantum/tests/unit/test_config.py                             | 2 +-
 quantum/tests/unit/test_db.py                                 | 2 +-
 quantum/tests/unit/test_db_plugin.py                          | 2 +-
 quantum/tests/unit/test_db_rpc_base.py                        | 2 +-
 quantum/tests/unit/test_dhcp_agent.py                         | 2 +-
 quantum/tests/unit/test_extension_portsecurity.py             | 2 +-
 quantum/tests/unit/test_extension_security_group.py           | 2 +-
 quantum/tests/unit/test_extensions.py                         | 2 +-
 quantum/tests/unit/test_linux_dhcp.py                         | 2 +-
 quantum/tests/unit/test_linux_interface.py                    | 2 +-
 quantum/tests/unit/test_linux_ip_lib.py                       | 2 +-
 quantum/tests/unit/test_loadbalancer_plugin.py                | 2 +-
 quantum/tests/unit/test_policy.py                             | 2 +-
 quantum/tests/unit/test_quantum_manager.py                    | 2 +-
 quantum/tests/unit/test_rootwrap.py                           | 2 +-
 quantum/tests/unit/test_servicetype.py                        | 2 +-
 quantum/tests/unit/test_wsgi.py                               | 2 +-
 quantum/tests/unit/testlib_api.py                             | 2 +-
 quantum/version.py                                            | 2 +-
 quantum/wsgi.py                                               | 2 +-
 run_tests.py                                                  | 2 +-
 setup.py                                                      | 2 +-
 tools/check_i18n.py                                           | 2 +-
 tools/install_venv.py                                         | 2 +-
 tools/with_venv.sh                                            | 2 +-
 200 files changed, 201 insertions(+), 201 deletions(-)

diff --git a/bin/quantum-debug b/bin/quantum-debug
index 45365709d..4a7d6c3c2 100755
--- a/bin/quantum-debug
+++ b/bin/quantum-debug
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 Openstack, LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/bin/quantum-dhcp-agent b/bin/quantum-dhcp-agent
index 56d7e6ea2..18b892717 100755
--- a/bin/quantum-dhcp-agent
+++ b/bin/quantum-dhcp-agent
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 Openstack, LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/bin/quantum-dhcp-agent-dnsmasq-lease-update b/bin/quantum-dhcp-agent-dnsmasq-lease-update
index d054fa8c6..8c8b5958a 100755
--- a/bin/quantum-dhcp-agent-dnsmasq-lease-update
+++ b/bin/quantum-dhcp-agent-dnsmasq-lease-update
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 Openstack, LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/bin/quantum-l3-agent b/bin/quantum-l3-agent
index 39413e275..d23168632 100755
--- a/bin/quantum-l3-agent
+++ b/bin/quantum-l3-agent
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 Openstack, LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/bin/quantum-lbaas-agent b/bin/quantum-lbaas-agent
index a53e4574b..c1b3be43a 100755
--- a/bin/quantum-lbaas-agent
+++ b/bin/quantum-lbaas-agent
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2013 Openstack, LLC.
+# Copyright (c) 2013 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/bin/quantum-metadata-agent b/bin/quantum-metadata-agent
index 5d0ff8f6c..6fede5fe4 100755
--- a/bin/quantum-metadata-agent
+++ b/bin/quantum-metadata-agent
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 Openstack, LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/bin/quantum-netns-cleanup b/bin/quantum-netns-cleanup
index 63995e3cd..06710cba0 100755
--- a/bin/quantum-netns-cleanup
+++ b/bin/quantum-netns-cleanup
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 Openstack, LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/bin/quantum-ns-metadata-proxy b/bin/quantum-ns-metadata-proxy
index fa65c5f48..00fff9beb 100755
--- a/bin/quantum-ns-metadata-proxy
+++ b/bin/quantum-ns-metadata-proxy
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 Openstack, LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/bin/quantum-ovs-cleanup b/bin/quantum-ovs-cleanup
index 096b8a73d..be02bfbb8 100755
--- a/bin/quantum-ovs-cleanup
+++ b/bin/quantum-ovs-cleanup
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 Openstack, LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/bin/quantum-rootwrap b/bin/quantum-rootwrap
index 6b9973309..0e3383fe9 100755
--- a/bin/quantum-rootwrap
+++ b/bin/quantum-rootwrap
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 Openstack, LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/bin/quantum-rpc-zmq-receiver b/bin/quantum-rpc-zmq-receiver
index d79fdb515..36b0f1ac0 100755
--- a/bin/quantum-rpc-zmq-receiver
+++ b/bin/quantum-rpc-zmq-receiver
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # 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/doc/source/conf.py b/doc/source/conf.py
index abaf6c251..e5e764fbb 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2010 OpenStack, LLC.
+# Copyright (c) 2010 OpenStack Foundation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -69,7 +69,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Quantum'
-copyright = u'2011-present, OpenStack, LLC.'
+copyright = u'2011-present, OpenStack Foundation.'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/doc/source/docbkx/quantum-api-1.0/xsd/actions.xsd b/doc/source/docbkx/quantum-api-1.0/xsd/actions.xsd
index 5633438c2..41545111d 100644
--- a/doc/source/docbkx/quantum-api-1.0/xsd/actions.xsd
+++ b/doc/source/docbkx/quantum-api-1.0/xsd/actions.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xsl"?>
 
-<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+<!-- (C) 2011 OpenStack Foundation., All Rights Reserved -->
 
 <schema
     elementFormDefault="qualified"
diff --git a/doc/source/docbkx/quantum-api-1.0/xsd/api-common.xsd b/doc/source/docbkx/quantum-api-1.0/xsd/api-common.xsd
index 92745929e..6557a1047 100644
--- a/doc/source/docbkx/quantum-api-1.0/xsd/api-common.xsd
+++ b/doc/source/docbkx/quantum-api-1.0/xsd/api-common.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xsl"?>
 
-<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+<!-- (C) 2011 OpenStack Foundation., All Rights Reserved -->
 
 <schema
     elementFormDefault="qualified"
diff --git a/doc/source/docbkx/quantum-api-1.0/xsd/api.xsd b/doc/source/docbkx/quantum-api-1.0/xsd/api.xsd
index 485ea9860..420aa663a 100644
--- a/doc/source/docbkx/quantum-api-1.0/xsd/api.xsd
+++ b/doc/source/docbkx/quantum-api-1.0/xsd/api.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xsl"?>
 
-<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+<!-- (C) 2011 OpenStack Foundation., All Rights Reserved -->
 
 <schema
     elementFormDefault="qualified"
diff --git a/doc/source/docbkx/quantum-api-1.0/xsd/common.xsd b/doc/source/docbkx/quantum-api-1.0/xsd/common.xsd
index c157ea579..f60999ebd 100644
--- a/doc/source/docbkx/quantum-api-1.0/xsd/common.xsd
+++ b/doc/source/docbkx/quantum-api-1.0/xsd/common.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xsl"?>
 
-<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+<!-- (C) 2011 OpenStack Foundation., All Rights Reserved -->
 
 <schema
     elementFormDefault="qualified"
diff --git a/doc/source/docbkx/quantum-api-1.0/xsd/extensions.xsd b/doc/source/docbkx/quantum-api-1.0/xsd/extensions.xsd
index ccebe7bf7..7e0695a37 100644
--- a/doc/source/docbkx/quantum-api-1.0/xsd/extensions.xsd
+++ b/doc/source/docbkx/quantum-api-1.0/xsd/extensions.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xsl"?>
 
-<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+<!-- (C) 2011 OpenStack Foundation., All Rights Reserved -->
 
 <xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified"
            targetNamespace="http://docs.openstack.org/common/api/v1.0"
diff --git a/doc/source/docbkx/quantum-api-1.0/xsd/faults.xsd b/doc/source/docbkx/quantum-api-1.0/xsd/faults.xsd
index e37e1e62b..b8d073016 100644
--- a/doc/source/docbkx/quantum-api-1.0/xsd/faults.xsd
+++ b/doc/source/docbkx/quantum-api-1.0/xsd/faults.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xsl"?>
 
-<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+<!-- (C) 2011 OpenStack Foundation., All Rights Reserved -->
 
 
 <schema
diff --git a/doc/source/docbkx/quantum-api-1.0/xsd/flavor.xsd b/doc/source/docbkx/quantum-api-1.0/xsd/flavor.xsd
index 7a410518f..dd4c7c78f 100644
--- a/doc/source/docbkx/quantum-api-1.0/xsd/flavor.xsd
+++ b/doc/source/docbkx/quantum-api-1.0/xsd/flavor.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xsl"?>
 
-<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+<!-- (C) 2011 OpenStack Foundation., All Rights Reserved -->
 
 <schema
     elementFormDefault="qualified"
diff --git a/doc/source/docbkx/quantum-api-1.0/xsd/image.xsd b/doc/source/docbkx/quantum-api-1.0/xsd/image.xsd
index 83036189c..d0481bbd2 100644
--- a/doc/source/docbkx/quantum-api-1.0/xsd/image.xsd
+++ b/doc/source/docbkx/quantum-api-1.0/xsd/image.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xsl"?>
 
-<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+<!-- (C) 2011 OpenStack Foundation., All Rights Reserved -->
 
 <schema
     elementFormDefault="qualified"
diff --git a/doc/source/docbkx/quantum-api-1.0/xsd/limits.xsd b/doc/source/docbkx/quantum-api-1.0/xsd/limits.xsd
index 9dd9b17a5..76f3a689f 100644
--- a/doc/source/docbkx/quantum-api-1.0/xsd/limits.xsd
+++ b/doc/source/docbkx/quantum-api-1.0/xsd/limits.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xsl"?>
 
-<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+<!-- (C) 2011 OpenStack Foundation., All Rights Reserved -->
 
 <xs:schema elementFormDefault="qualified" attributeFormDefault="unqualified"
            targetNamespace="http://docs.openstack.org/common/api/v1.0"
diff --git a/doc/source/docbkx/quantum-api-1.0/xsd/metadata.xsd b/doc/source/docbkx/quantum-api-1.0/xsd/metadata.xsd
index 57acc4561..29facc2a6 100644
--- a/doc/source/docbkx/quantum-api-1.0/xsd/metadata.xsd
+++ b/doc/source/docbkx/quantum-api-1.0/xsd/metadata.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xsl"?>
 
-<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+<!-- (C) 2011 OpenStack Foundation., All Rights Reserved -->
 
 <schema
         elementFormDefault="qualified"
diff --git a/doc/source/docbkx/quantum-api-1.0/xsd/server.xsd b/doc/source/docbkx/quantum-api-1.0/xsd/server.xsd
index 1c89c8b3f..1b6b95333 100644
--- a/doc/source/docbkx/quantum-api-1.0/xsd/server.xsd
+++ b/doc/source/docbkx/quantum-api-1.0/xsd/server.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xsl"?>
 
-<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+<!-- (C) 2011 OpenStack Foundation., All Rights Reserved -->
 
 <schema
     elementFormDefault="qualified"
diff --git a/doc/source/docbkx/quantum-api-1.0/xsd/version.xsd b/doc/source/docbkx/quantum-api-1.0/xsd/version.xsd
index 90b39aae0..c89c2b2f5 100644
--- a/doc/source/docbkx/quantum-api-1.0/xsd/version.xsd
+++ b/doc/source/docbkx/quantum-api-1.0/xsd/version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="../xslt/schema.xsl"?>
 
-<!-- (C) 2011 OpenStack LLC., All Rights Reserved -->
+<!-- (C) 2011 OpenStack Foundation., All Rights Reserved -->
 
 <xs:schema elementFormDefault="qualified" attributeFormDefault="unqualified"
            targetNamespace="http://docs.openstack.org/common/api/v1.0"
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 391632d5b..654768d5d 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1,5 +1,5 @@
 ..
-      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/doc/source/man/quantum-server.rst b/doc/source/man/quantum-server.rst
index 3dc71d594..6a0bc9a64 100644
--- a/doc/source/man/quantum-server.rst
+++ b/doc/source/man/quantum-server.rst
@@ -8,7 +8,7 @@ Quantum Server
 
 :Author: openstack@lists.launchpad.net
 :Date:   2012-04-05
-:Copyright: OpenStack LLC
+:Copyright: OpenStack Foundation
 :Version: 2012.1
 :Manual section: 1
 :Manual group: cloud computing
diff --git a/quantum/__init__.py b/quantum/__init__.py
index 63cb82cd8..25ce3af01 100644
--- a/quantum/__init__.py
+++ b/quantum/__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/quantum/agent/__init__.py b/quantum/agent/__init__.py
index 304bb14ea..0b3d2db5e 100644
--- a/quantum/agent/__init__.py
+++ b/quantum/agent/__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/quantum/agent/common/__init__.py b/quantum/agent/common/__init__.py
index 304bb14ea..0b3d2db5e 100644
--- a/quantum/agent/common/__init__.py
+++ b/quantum/agent/common/__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/quantum/agent/common/config.py b/quantum/agent/common/config.py
index 5e6a6a261..a3263b5e9 100644
--- a/quantum/agent/common/config.py
+++ b/quantum/agent/common/config.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/quantum/agent/dhcp_agent.py b/quantum/agent/dhcp_agent.py
index 1de865337..c5d4a0313 100644
--- a/quantum/agent/dhcp_agent.py
+++ b/quantum/agent/dhcp_agent.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/quantum/agent/linux/__init__.py b/quantum/agent/linux/__init__.py
index 304bb14ea..0b3d2db5e 100644
--- a/quantum/agent/linux/__init__.py
+++ b/quantum/agent/linux/__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/quantum/agent/linux/dhcp.py b/quantum/agent/linux/dhcp.py
index 8b6f62d5a..709d7da32 100644
--- a/quantum/agent/linux/dhcp.py
+++ b/quantum/agent/linux/dhcp.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/quantum/agent/linux/interface.py b/quantum/agent/linux/interface.py
index b07cbbd57..e057b24a8 100644
--- a/quantum/agent/linux/interface.py
+++ b/quantum/agent/linux/interface.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/quantum/agent/linux/ip_lib.py b/quantum/agent/linux/ip_lib.py
index 1f618c3f9..5207c230e 100644
--- a/quantum/agent/linux/ip_lib.py
+++ b/quantum/agent/linux/ip_lib.py
@@ -1,5 +1,5 @@
 # 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/quantum/agent/netns_cleanup_util.py b/quantum/agent/netns_cleanup_util.py
index 359c8768b..4090f7caa 100644
--- a/quantum/agent/netns_cleanup_util.py
+++ b/quantum/agent/netns_cleanup_util.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/agent/ovs_cleanup_util.py b/quantum/agent/ovs_cleanup_util.py
index 585232c93..3f9601827 100644
--- a/quantum/agent/ovs_cleanup_util.py
+++ b/quantum/agent/ovs_cleanup_util.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/agent/rpc.py b/quantum/agent/rpc.py
index 899c34504..6360ad494 100644
--- a/quantum/agent/rpc.py
+++ b/quantum/agent/rpc.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/api/extensions.py b/quantum/api/extensions.py
index f1ae27854..286f00e33 100644
--- a/quantum/api/extensions.py
+++ b/quantum/api/extensions.py
@@ -1,7 +1,7 @@
 
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation.
 # Copyright 2011 Justin Santa Barbara
 # All Rights Reserved.
 #
diff --git a/quantum/api/rpc/__init__.py b/quantum/api/rpc/__init__.py
index c6fab2ebb..84f6d4748 100644
--- a/quantum/api/rpc/__init__.py
+++ b/quantum/api/rpc/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 OpenStack, LLC.
+# Copyright (c) 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/quantum/api/rpc/agentnotifiers/__init__.py b/quantum/api/rpc/agentnotifiers/__init__.py
index c6fab2ebb..84f6d4748 100644
--- a/quantum/api/rpc/agentnotifiers/__init__.py
+++ b/quantum/api/rpc/agentnotifiers/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 OpenStack, LLC.
+# Copyright (c) 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/quantum/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py b/quantum/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py
index c89e6199a..21115576a 100644
--- a/quantum/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py
+++ b/quantum/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 OpenStack, LLC.
+# Copyright (c) 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/quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py b/quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py
index c5085cb61..9f716d65f 100644
--- a/quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py
+++ b/quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 OpenStack, LLC.
+# Copyright (c) 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/quantum/api/v2/__init__.py b/quantum/api/v2/__init__.py
index cf6894721..72bebec69 100644
--- a/quantum/api/v2/__init__.py
+++ b/quantum/api/v2/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/api/v2/attributes.py b/quantum/api/v2/attributes.py
index 72545ee4b..14496037d 100644
--- a/quantum/api/v2/attributes.py
+++ b/quantum/api/v2/attributes.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the 'License'); you may
diff --git a/quantum/api/v2/base.py b/quantum/api/v2/base.py
index 8f6267701..8fc46377a 100644
--- a/quantum/api/v2/base.py
+++ b/quantum/api/v2/base.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/api/v2/resource.py b/quantum/api/v2/resource.py
index 144e1a9a8..be7109630 100644
--- a/quantum/api/v2/resource.py
+++ b/quantum/api/v2/resource.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/quantum/api/v2/router.py b/quantum/api/v2/router.py
index 7cbeffe51..5590b3419 100644
--- a/quantum/api/v2/router.py
+++ b/quantum/api/v2/router.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/api/views/versions.py b/quantum/api/views/versions.py
index d0145c94a..441989c6d 100644
--- a/quantum/api/views/versions.py
+++ b/quantum/api/views/versions.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/quantum/auth.py b/quantum/auth.py
index 7279f279f..fb386946a 100644
--- a/quantum/auth.py
+++ b/quantum/auth.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/quantum/common/constants.py b/quantum/common/constants.py
index 966a3fd54..9557b97dd 100644
--- a/quantum/common/constants.py
+++ b/quantum/common/constants.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/common/rpc.py b/quantum/common/rpc.py
index 01e3ee80c..a381db9a2 100644
--- a/quantum/common/rpc.py
+++ b/quantum/common/rpc.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/common/test_lib.py b/quantum/common/test_lib.py
index dee94cfc7..e6c440c4c 100644
--- a/quantum/common/test_lib.py
+++ b/quantum/common/test_lib.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2010 OpenStack, LLC
+# Copyright (c) 2010 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/quantum/common/topics.py b/quantum/common/topics.py
index 4a2554958..06db33801 100644
--- a/quantum/common/topics.py
+++ b/quantum/common/topics.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/context.py b/quantum/context.py
index 7766a0629..236da4d75 100644
--- a/quantum/context.py
+++ b/quantum/context.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/quantum/db/agents_db.py b/quantum/db/agents_db.py
index ad6c0ec28..2f5230af3 100644
--- a/quantum/db/agents_db.py
+++ b/quantum/db/agents_db.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2013 OpenStack LLC.
+# Copyright (c) 2013 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/db/agentschedulers_db.py b/quantum/db/agentschedulers_db.py
index bb82979a9..c84d7fa95 100644
--- a/quantum/db/agentschedulers_db.py
+++ b/quantum/db/agentschedulers_db.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2013 OpenStack LLC.
+# Copyright (c) 2013 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/db/db_base_plugin_v2.py b/quantum/db/db_base_plugin_v2.py
index b5dce8bcc..6182c45e2 100644
--- a/quantum/db/db_base_plugin_v2.py
+++ b/quantum/db/db_base_plugin_v2.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/db/dhcp_rpc_base.py b/quantum/db/dhcp_rpc_base.py
index 958147251..08b8c99c2 100644
--- a/quantum/db/dhcp_rpc_base.py
+++ b/quantum/db/dhcp_rpc_base.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/db/l3_rpc_base.py b/quantum/db/l3_rpc_base.py
index 4a8635679..c4db05442 100644
--- a/quantum/db/l3_rpc_base.py
+++ b/quantum/db/l3_rpc_base.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/db/loadbalancer/__init__.py b/quantum/db/loadbalancer/__init__.py
index 009a3d7b7..cae279d0a 100644
--- a/quantum/db/loadbalancer/__init__.py
+++ b/quantum/db/loadbalancer/__init__.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/quantum/db/loadbalancer/loadbalancer_db.py b/quantum/db/loadbalancer/loadbalancer_db.py
index 7158cfe10..1d60a72fe 100644
--- a/quantum/db/loadbalancer/loadbalancer_db.py
+++ b/quantum/db/loadbalancer/loadbalancer_db.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 #
-# Copyright 2013 OpenStack LLC.  All rights reserved
+# Copyright 2013 OpenStack Foundation.  All rights reserved
 #
 #    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/quantum/db/migration/alembic_migrations/common_ext_ops.py b/quantum/db/migration/alembic_migrations/common_ext_ops.py
index 197711341..04d2ec626 100644
--- a/quantum/db/migration/alembic_migrations/common_ext_ops.py
+++ b/quantum/db/migration/alembic_migrations/common_ext_ops.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/quantum/db/migration/alembic_migrations/script.py.mako b/quantum/db/migration/alembic_migrations/script.py.mako
index 4a8bbb7b7..630aa5090 100644
--- a/quantum/db/migration/alembic_migrations/script.py.mako
+++ b/quantum/db/migration/alembic_migrations/script.py.mako
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 #
-# Copyright ${create_date.year} OpenStack LLC
+# Copyright ${create_date.year} 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/quantum/db/migration/alembic_migrations/versions/1149d7de0cfa_port_security.py b/quantum/db/migration/alembic_migrations/versions/1149d7de0cfa_port_security.py
index 10d3fb1b8..9cc2341da 100644
--- a/quantum/db/migration/alembic_migrations/versions/1149d7de0cfa_port_security.py
+++ b/quantum/db/migration/alembic_migrations/versions/1149d7de0cfa_port_security.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/quantum/db/migration/alembic_migrations/versions/1341ed32cc1e_nvp_netbinding_update.py b/quantum/db/migration/alembic_migrations/versions/1341ed32cc1e_nvp_netbinding_update.py
index cd81b8115..4fb4654b9 100644
--- a/quantum/db/migration/alembic_migrations/versions/1341ed32cc1e_nvp_netbinding_update.py
+++ b/quantum/db/migration/alembic_migrations/versions/1341ed32cc1e_nvp_netbinding_update.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/quantum/db/migration/alembic_migrations/versions/1b693c095aa3_quota_ext_db_grizzly.py b/quantum/db/migration/alembic_migrations/versions/1b693c095aa3_quota_ext_db_grizzly.py
index 0fb471eb6..209b546d7 100644
--- a/quantum/db/migration/alembic_migrations/versions/1b693c095aa3_quota_ext_db_grizzly.py
+++ b/quantum/db/migration/alembic_migrations/versions/1b693c095aa3_quota_ext_db_grizzly.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/quantum/db/migration/alembic_migrations/versions/1c33fa3cd1a1_extra_route_config.py b/quantum/db/migration/alembic_migrations/versions/1c33fa3cd1a1_extra_route_config.py
index 4d18f146e..07fb63c96 100644
--- a/quantum/db/migration/alembic_migrations/versions/1c33fa3cd1a1_extra_route_config.py
+++ b/quantum/db/migration/alembic_migrations/versions/1c33fa3cd1a1_extra_route_config.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/quantum/db/migration/alembic_migrations/versions/1d76643bcec4_nvp_netbinding.py b/quantum/db/migration/alembic_migrations/versions/1d76643bcec4_nvp_netbinding.py
index bb2cd78dc..f61ab2e8a 100644
--- a/quantum/db/migration/alembic_migrations/versions/1d76643bcec4_nvp_netbinding.py
+++ b/quantum/db/migration/alembic_migrations/versions/1d76643bcec4_nvp_netbinding.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/quantum/db/migration/alembic_migrations/versions/2a6d0b51f4bb_cisco_plugin_cleanup.py b/quantum/db/migration/alembic_migrations/versions/2a6d0b51f4bb_cisco_plugin_cleanup.py
index 39f8075cb..f432c4641 100644
--- a/quantum/db/migration/alembic_migrations/versions/2a6d0b51f4bb_cisco_plugin_cleanup.py
+++ b/quantum/db/migration/alembic_migrations/versions/2a6d0b51f4bb_cisco_plugin_cleanup.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/quantum/db/migration/alembic_migrations/versions/2c4af419145b_l3_support.py b/quantum/db/migration/alembic_migrations/versions/2c4af419145b_l3_support.py
index 97a7afc5b..5cebeb01d 100644
--- a/quantum/db/migration/alembic_migrations/versions/2c4af419145b_l3_support.py
+++ b/quantum/db/migration/alembic_migrations/versions/2c4af419145b_l3_support.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/quantum/db/migration/alembic_migrations/versions/363468ac592c_nvp_network_gw.py b/quantum/db/migration/alembic_migrations/versions/363468ac592c_nvp_network_gw.py
index eda8db8b6..f8b002d8b 100644
--- a/quantum/db/migration/alembic_migrations/versions/363468ac592c_nvp_network_gw.py
+++ b/quantum/db/migration/alembic_migrations/versions/363468ac592c_nvp_network_gw.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/quantum/db/migration/alembic_migrations/versions/38335592a0dc_nvp_portmap.py b/quantum/db/migration/alembic_migrations/versions/38335592a0dc_nvp_portmap.py
index 23cafadfd..e327c7885 100644
--- a/quantum/db/migration/alembic_migrations/versions/38335592a0dc_nvp_portmap.py
+++ b/quantum/db/migration/alembic_migrations/versions/38335592a0dc_nvp_portmap.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/quantum/db/migration/alembic_migrations/versions/3b54bf9e29f7_nec_plugin_sharednet.py b/quantum/db/migration/alembic_migrations/versions/3b54bf9e29f7_nec_plugin_sharednet.py
index a67107d4c..d8109183b 100644
--- a/quantum/db/migration/alembic_migrations/versions/3b54bf9e29f7_nec_plugin_sharednet.py
+++ b/quantum/db/migration/alembic_migrations/versions/3b54bf9e29f7_nec_plugin_sharednet.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/quantum/db/migration/alembic_migrations/versions/3cb5d900c5de_security_groups.py b/quantum/db/migration/alembic_migrations/versions/3cb5d900c5de_security_groups.py
index 21aea463e..2ac9c7edf 100644
--- a/quantum/db/migration/alembic_migrations/versions/3cb5d900c5de_security_groups.py
+++ b/quantum/db/migration/alembic_migrations/versions/3cb5d900c5de_security_groups.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/quantum/db/migration/alembic_migrations/versions/45680af419f9_nvp_qos.py b/quantum/db/migration/alembic_migrations/versions/45680af419f9_nvp_qos.py
index 8af65c2c6..68ce093d7 100644
--- a/quantum/db/migration/alembic_migrations/versions/45680af419f9_nvp_qos.py
+++ b/quantum/db/migration/alembic_migrations/versions/45680af419f9_nvp_qos.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/quantum/db/migration/alembic_migrations/versions/4692d074d587_agent_scheduler.py b/quantum/db/migration/alembic_migrations/versions/4692d074d587_agent_scheduler.py
index 0cfd44641..a5a0f3cf5 100644
--- a/quantum/db/migration/alembic_migrations/versions/4692d074d587_agent_scheduler.py
+++ b/quantum/db/migration/alembic_migrations/versions/4692d074d587_agent_scheduler.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/quantum/db/migration/alembic_migrations/versions/48b6f43f7471_service_type.py b/quantum/db/migration/alembic_migrations/versions/48b6f43f7471_service_type.py
index 80a4939d7..ccd363c0d 100644
--- a/quantum/db/migration/alembic_migrations/versions/48b6f43f7471_service_type.py
+++ b/quantum/db/migration/alembic_migrations/versions/48b6f43f7471_service_type.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/quantum/db/migration/alembic_migrations/versions/49332180ca96_ryu_plugin_update.py b/quantum/db/migration/alembic_migrations/versions/49332180ca96_ryu_plugin_update.py
index dd17c2552..318ff2f3f 100644
--- a/quantum/db/migration/alembic_migrations/versions/49332180ca96_ryu_plugin_update.py
+++ b/quantum/db/migration/alembic_migrations/versions/49332180ca96_ryu_plugin_update.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/quantum/db/migration/alembic_migrations/versions/511471cc46b_agent_ext_model_supp.py b/quantum/db/migration/alembic_migrations/versions/511471cc46b_agent_ext_model_supp.py
index 0ee357066..80bb8647c 100644
--- a/quantum/db/migration/alembic_migrations/versions/511471cc46b_agent_ext_model_supp.py
+++ b/quantum/db/migration/alembic_migrations/versions/511471cc46b_agent_ext_model_supp.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/quantum/db/migration/alembic_migrations/versions/54c2c487e913_lbaas.py b/quantum/db/migration/alembic_migrations/versions/54c2c487e913_lbaas.py
index 09ed5208d..7e18e2d28 100644
--- a/quantum/db/migration/alembic_migrations/versions/54c2c487e913_lbaas.py
+++ b/quantum/db/migration/alembic_migrations/versions/54c2c487e913_lbaas.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/quantum/db/migration/alembic_migrations/versions/grizzly_release.py b/quantum/db/migration/alembic_migrations/versions/grizzly_release.py
index 21f9a00e7..0ac892f13 100644
--- a/quantum/db/migration/alembic_migrations/versions/grizzly_release.py
+++ b/quantum/db/migration/alembic_migrations/versions/grizzly_release.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/quantum/db/model_base.py b/quantum/db/model_base.py
index c8ceb80b1..194fdb96d 100644
--- a/quantum/db/model_base.py
+++ b/quantum/db/model_base.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/db/models_v2.py b/quantum/db/models_v2.py
index 122828fb9..6fa0f84d8 100644
--- a/quantum/db/models_v2.py
+++ b/quantum/db/models_v2.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/db/quota_db.py b/quantum/db/quota_db.py
index c4954d209..51c3b32e5 100644
--- a/quantum/db/quota_db.py
+++ b/quantum/db/quota_db.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/quantum/db/servicetype_db.py b/quantum/db/servicetype_db.py
index 1f619bc87..fff5f6356 100644
--- a/quantum/db/servicetype_db.py
+++ b/quantum/db/servicetype_db.py
@@ -1,5 +1,5 @@
 # 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/quantum/db/sqlalchemyutils.py b/quantum/db/sqlalchemyutils.py
index d524634e7..fffc6ceb5 100644
--- a/quantum/db/sqlalchemyutils.py
+++ b/quantum/db/sqlalchemyutils.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/quantum/extensions/__init__.py b/quantum/extensions/__init__.py
index 848908a95..4ac574e58 100644
--- a/quantum/extensions/__init__.py
+++ b/quantum/extensions/__init__.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/quantum/extensions/agent.py b/quantum/extensions/agent.py
index c83325519..430068255 100644
--- a/quantum/extensions/agent.py
+++ b/quantum/extensions/agent.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 OpenStack, LLC.
+# Copyright (c) 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/quantum/extensions/agentscheduler.py b/quantum/extensions/agentscheduler.py
index 73ae370e2..adf430c23 100644
--- a/quantum/extensions/agentscheduler.py
+++ b/quantum/extensions/agentscheduler.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2013 OpenStack, LLC.
+# Copyright (c) 2013 OpenStack Foundation.
 # All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/extensions/loadbalancer.py b/quantum/extensions/loadbalancer.py
index 3f13849ea..a93a5f839 100644
--- a/quantum/extensions/loadbalancer.py
+++ b/quantum/extensions/loadbalancer.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/quantum/extensions/portbindings.py b/quantum/extensions/portbindings.py
index 6ee219b57..403c7532a 100644
--- a/quantum/extensions/portbindings.py
+++ b/quantum/extensions/portbindings.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/extensions/providernet.py b/quantum/extensions/providernet.py
index b37436c25..314850aa6 100644
--- a/quantum/extensions/providernet.py
+++ b/quantum/extensions/providernet.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/extensions/quotasv2.py b/quantum/extensions/quotasv2.py
index 1f9c634b9..eb981ceb3 100644
--- a/quantum/extensions/quotasv2.py
+++ b/quantum/extensions/quotasv2.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/quantum/extensions/securitygroup.py b/quantum/extensions/securitygroup.py
index 108f5d9e7..8162218a6 100644
--- a/quantum/extensions/securitygroup.py
+++ b/quantum/extensions/securitygroup.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/extensions/servicetype.py b/quantum/extensions/servicetype.py
index 58fae25f6..3d43f7f63 100644
--- a/quantum/extensions/servicetype.py
+++ b/quantum/extensions/servicetype.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/quantum/plugins/__init__.py b/quantum/plugins/__init__.py
index cbf4a4506..7e503debd 100644
--- a/quantum/plugins/__init__.py
+++ b/quantum/plugins/__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/quantum/plugins/bigswitch/version.py b/quantum/plugins/bigswitch/version.py
index 711d1052b..5ea183f9f 100755
--- a/quantum/plugins/bigswitch/version.py
+++ b/quantum/plugins/bigswitch/version.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2012 OpenStack, LLC
+# Copyright 2012 OpenStack Foundation
 # Copyright 2012, Big Switch Networks, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/plugins/cisco/extensions/__init__.py b/quantum/plugins/cisco/extensions/__init__.py
index fcab2ee65..63082aba2 100644
--- a/quantum/plugins/cisco/extensions/__init__.py
+++ b/quantum/plugins/cisco/extensions/__init__.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/quantum/plugins/cisco/run_tests.py b/quantum/plugins/cisco/run_tests.py
index fa8c892db..915304cce 100755
--- a/quantum/plugins/cisco/run_tests.py
+++ b/quantum/plugins/cisco/run_tests.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010 OpenStack, LLC
+# Copyright 2010 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/quantum/plugins/cisco/tests/unit/__init__.py b/quantum/plugins/cisco/tests/unit/__init__.py
index 319c1d1c7..d13f4b8b1 100644
--- a/quantum/plugins/cisco/tests/unit/__init__.py
+++ b/quantum/plugins/cisco/tests/unit/__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/quantum/plugins/cisco/tests/unit/test_cisco_extension.py b/quantum/plugins/cisco/tests/unit/test_cisco_extension.py
index acc022062..2749a6e3f 100644
--- a/quantum/plugins/cisco/tests/unit/test_cisco_extension.py
+++ b/quantum/plugins/cisco/tests/unit/test_cisco_extension.py
@@ -1,5 +1,5 @@
 # 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/quantum/plugins/cisco/tests/unit/v2/__init__.py b/quantum/plugins/cisco/tests/unit/v2/__init__.py
index c8bda896e..a68ed41ea 100644
--- a/quantum/plugins/cisco/tests/unit/v2/__init__.py
+++ b/quantum/plugins/cisco/tests/unit/v2/__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/quantum/plugins/cisco/tests/unit/v2/nexus/__init__.py b/quantum/plugins/cisco/tests/unit/v2/nexus/__init__.py
index c8bda896e..a68ed41ea 100644
--- a/quantum/plugins/cisco/tests/unit/v2/nexus/__init__.py
+++ b/quantum/plugins/cisco/tests/unit/v2/nexus/__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/quantum/plugins/cisco/tests/unit/v2/test_api_v2.py b/quantum/plugins/cisco/tests/unit/v2/test_api_v2.py
index cfa3dc6ea..8d3132e80 100644
--- a/quantum/plugins/cisco/tests/unit/v2/test_api_v2.py
+++ b/quantum/plugins/cisco/tests/unit/v2/test_api_v2.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/plugins/common/__init__.py b/quantum/plugins/common/__init__.py
index cbf4a4506..7e503debd 100644
--- a/quantum/plugins/common/__init__.py
+++ b/quantum/plugins/common/__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/quantum/plugins/common/constants.py b/quantum/plugins/common/constants.py
index 2a560d6bd..650fa4051 100644
--- a/quantum/plugins/common/constants.py
+++ b/quantum/plugins/common/constants.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/quantum/plugins/linuxbridge/db/l2network_db_v2.py b/quantum/plugins/linuxbridge/db/l2network_db_v2.py
index 8f893294e..b58996f73 100644
--- a/quantum/plugins/linuxbridge/db/l2network_db_v2.py
+++ b/quantum/plugins/linuxbridge/db/l2network_db_v2.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/plugins/linuxbridge/db/l2network_models_v2.py b/quantum/plugins/linuxbridge/db/l2network_models_v2.py
index 6841cfb90..c6451fe3d 100644
--- a/quantum/plugins/linuxbridge/db/l2network_models_v2.py
+++ b/quantum/plugins/linuxbridge/db/l2network_models_v2.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/plugins/linuxbridge/lb_quantum_plugin.py b/quantum/plugins/linuxbridge/lb_quantum_plugin.py
index 6f2875af1..8b18c51ee 100644
--- a/quantum/plugins/linuxbridge/lb_quantum_plugin.py
+++ b/quantum/plugins/linuxbridge/lb_quantum_plugin.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/plugins/metaplugin/run_tests.py b/quantum/plugins/metaplugin/run_tests.py
index 50e36da30..2d22b417b 100755
--- a/quantum/plugins/metaplugin/run_tests.py
+++ b/quantum/plugins/metaplugin/run_tests.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010 OpenStack, LLC
+# Copyright 2010 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/quantum/plugins/openvswitch/common/constants.py b/quantum/plugins/openvswitch/common/constants.py
index 20a22a8f1..6d837fe57 100644
--- a/quantum/plugins/openvswitch/common/constants.py
+++ b/quantum/plugins/openvswitch/common/constants.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/plugins/services/__init__.py b/quantum/plugins/services/__init__.py
index cbf4a4506..7e503debd 100644
--- a/quantum/plugins/services/__init__.py
+++ b/quantum/plugins/services/__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/quantum/plugins/services/agent_loadbalancer/__init__.py b/quantum/plugins/services/agent_loadbalancer/__init__.py
index c65c52d23..5e8da711f 100644
--- a/quantum/plugins/services/agent_loadbalancer/__init__.py
+++ b/quantum/plugins/services/agent_loadbalancer/__init__.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/quantum/plugins/services/agent_loadbalancer/plugin.py b/quantum/plugins/services/agent_loadbalancer/plugin.py
index 216a9acf2..748669aa1 100644
--- a/quantum/plugins/services/agent_loadbalancer/plugin.py
+++ b/quantum/plugins/services/agent_loadbalancer/plugin.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/quantum/plugins/services/service_base.py b/quantum/plugins/services/service_base.py
index 0acca5341..ef933c08a 100644
--- a/quantum/plugins/services/service_base.py
+++ b/quantum/plugins/services/service_base.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/quantum/policy.py b/quantum/policy.py
index d8e31456e..e2b548444 100644
--- a/quantum/policy.py
+++ b/quantum/policy.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/quota.py b/quantum/quota.py
index 2a9d4f011..3d229eaff 100644
--- a/quantum/quota.py
+++ b/quantum/quota.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/quantum/rootwrap/__init__.py b/quantum/rootwrap/__init__.py
index 9bd7a21b8..d5943e885 100644
--- a/quantum/rootwrap/__init__.py
+++ b/quantum/rootwrap/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 Openstack, LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/rootwrap/filters.py b/quantum/rootwrap/filters.py
index 06b38e1c0..58b3c183f 100644
--- a/quantum/rootwrap/filters.py
+++ b/quantum/rootwrap/filters.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 Openstack, LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/rootwrap/wrapper.py b/quantum/rootwrap/wrapper.py
index 7579ef898..85a2387fa 100644
--- a/quantum/rootwrap/wrapper.py
+++ b/quantum/rootwrap/wrapper.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 Openstack, LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/scheduler/__init__.py b/quantum/scheduler/__init__.py
index 082601856..9dc2a46c3 100644
--- a/quantum/scheduler/__init__.py
+++ b/quantum/scheduler/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2013 OpenStack LLC.
+# Copyright (c) 2013 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/scheduler/dhcp_agent_scheduler.py b/quantum/scheduler/dhcp_agent_scheduler.py
index e8ae31950..d0b63d4f2 100644
--- a/quantum/scheduler/dhcp_agent_scheduler.py
+++ b/quantum/scheduler/dhcp_agent_scheduler.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2013 OpenStack LLC.
+# Copyright (c) 2013 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/scheduler/l3_agent_scheduler.py b/quantum/scheduler/l3_agent_scheduler.py
index fda363f32..dfd7b96ca 100644
--- a/quantum/scheduler/l3_agent_scheduler.py
+++ b/quantum/scheduler/l3_agent_scheduler.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2013 OpenStack LLC.
+# Copyright (c) 2013 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/tests/__init__.py b/quantum/tests/__init__.py
index 671d3c173..2d32e4ef3 100644
--- a/quantum/tests/__init__.py
+++ b/quantum/tests/__init__.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/quantum/tests/base.py b/quantum/tests/base.py
index 7a582fa9a..b8b9cebab 100644
--- a/quantum/tests/base.py
+++ b/quantum/tests/base.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/quantum/tests/unit/__init__.py b/quantum/tests/unit/__init__.py
index eeda0121b..a05454030 100644
--- a/quantum/tests/unit/__init__.py
+++ b/quantum/tests/unit/__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/quantum/tests/unit/_test_rootwrap_exec.py b/quantum/tests/unit/_test_rootwrap_exec.py
index e1f54df8f..740afa0f9 100644
--- a/quantum/tests/unit/_test_rootwrap_exec.py
+++ b/quantum/tests/unit/_test_rootwrap_exec.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack, LLC
+# Copyright (c) 2012 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/tests/unit/bigswitch/__init__.py b/quantum/tests/unit/bigswitch/__init__.py
index cbf4a4506..7e503debd 100644
--- a/quantum/tests/unit/bigswitch/__init__.py
+++ b/quantum/tests/unit/bigswitch/__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/quantum/tests/unit/brocade/__init__.py b/quantum/tests/unit/brocade/__init__.py
index 4aeadb8bd..d1af8c59e 100644
--- a/quantum/tests/unit/brocade/__init__.py
+++ b/quantum/tests/unit/brocade/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 #
-# Copyright 2013 OpenStack LLC.
+# Copyright 2013 OpenStack Foundation.
 #
 # All Rights Reserved.
 #
diff --git a/quantum/tests/unit/brocade/test_brocade_db.py b/quantum/tests/unit/brocade/test_brocade_db.py
index 441dc41bd..9d53ff134 100644
--- a/quantum/tests/unit/brocade/test_brocade_db.py
+++ b/quantum/tests/unit/brocade/test_brocade_db.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 #
-# Copyright (c) 2013 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/brocade/test_brocade_plugin.py b/quantum/tests/unit/brocade/test_brocade_plugin.py
index c5e864e40..58d847394 100644
--- a/quantum/tests/unit/brocade/test_brocade_plugin.py
+++ b/quantum/tests/unit/brocade/test_brocade_plugin.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/brocade/test_brocade_vlan.py b/quantum/tests/unit/brocade/test_brocade_vlan.py
index 5640ca003..26eaa4ec0 100644
--- a/quantum/tests/unit/brocade/test_brocade_vlan.py
+++ b/quantum/tests/unit/brocade/test_brocade_vlan.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 #
-# Copyright (c) 2013 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/cisco/__init__.py b/quantum/tests/unit/cisco/__init__.py
index cbf4a4506..7e503debd 100644
--- a/quantum/tests/unit/cisco/__init__.py
+++ b/quantum/tests/unit/cisco/__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/quantum/tests/unit/cisco/test_network_plugin.py b/quantum/tests/unit/cisco/test_network_plugin.py
index bd770b21e..d79a6293a 100644
--- a/quantum/tests/unit/cisco/test_network_plugin.py
+++ b/quantum/tests/unit/cisco/test_network_plugin.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/cisco/test_nexus_plugin.py b/quantum/tests/unit/cisco/test_nexus_plugin.py
index f2814a362..98f56dc5f 100644
--- a/quantum/tests/unit/cisco/test_nexus_plugin.py
+++ b/quantum/tests/unit/cisco/test_nexus_plugin.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/db/__init__.py b/quantum/tests/unit/db/__init__.py
index 009a3d7b7..cae279d0a 100644
--- a/quantum/tests/unit/db/__init__.py
+++ b/quantum/tests/unit/db/__init__.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/quantum/tests/unit/db/loadbalancer/__init__.py b/quantum/tests/unit/db/loadbalancer/__init__.py
index 009a3d7b7..cae279d0a 100644
--- a/quantum/tests/unit/db/loadbalancer/__init__.py
+++ b/quantum/tests/unit/db/loadbalancer/__init__.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/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py b/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py
index a59992841..622212e10 100644
--- a/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py
+++ b/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/dummy_plugin.py b/quantum/tests/unit/dummy_plugin.py
index 745d3bea2..1bbc5dbba 100644
--- a/quantum/tests/unit/dummy_plugin.py
+++ b/quantum/tests/unit/dummy_plugin.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/quantum/tests/unit/extension_stubs.py b/quantum/tests/unit/extension_stubs.py
index 7797a2a25..28ce56b7d 100644
--- a/quantum/tests/unit/extension_stubs.py
+++ b/quantum/tests/unit/extension_stubs.py
@@ -1,5 +1,5 @@
 # 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/quantum/tests/unit/extensions/__init__.py b/quantum/tests/unit/extensions/__init__.py
index 848908a95..4ac574e58 100644
--- a/quantum/tests/unit/extensions/__init__.py
+++ b/quantum/tests/unit/extensions/__init__.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/quantum/tests/unit/extensions/foxinsocks.py b/quantum/tests/unit/extensions/foxinsocks.py
index 31e201880..2828f5dc2 100644
--- a/quantum/tests/unit/extensions/foxinsocks.py
+++ b/quantum/tests/unit/extensions/foxinsocks.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/quantum/tests/unit/extensions/v2attributes.py b/quantum/tests/unit/extensions/v2attributes.py
index 92f2028e7..49e86ba32 100644
--- a/quantum/tests/unit/extensions/v2attributes.py
+++ b/quantum/tests/unit/extensions/v2attributes.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/linuxbridge/__init__.py b/quantum/tests/unit/linuxbridge/__init__.py
index cbf4a4506..7e503debd 100644
--- a/quantum/tests/unit/linuxbridge/__init__.py
+++ b/quantum/tests/unit/linuxbridge/__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/quantum/tests/unit/linuxbridge/test_agent_scheduler.py b/quantum/tests/unit/linuxbridge/test_agent_scheduler.py
index bdd3f5735..1cd0a91ee 100644
--- a/quantum/tests/unit/linuxbridge/test_agent_scheduler.py
+++ b/quantum/tests/unit/linuxbridge/test_agent_scheduler.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/linuxbridge/test_defaults.py b/quantum/tests/unit/linuxbridge/test_defaults.py
index 78332dd4d..9e32f5e10 100644
--- a/quantum/tests/unit/linuxbridge/test_defaults.py
+++ b/quantum/tests/unit/linuxbridge/test_defaults.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/linuxbridge/test_lb_db.py b/quantum/tests/unit/linuxbridge/test_lb_db.py
index ae539f05b..3ab8453cf 100644
--- a/quantum/tests/unit/linuxbridge/test_lb_db.py
+++ b/quantum/tests/unit/linuxbridge/test_lb_db.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py b/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
index 1ab61d6f4..1cd6deb85 100644
--- a/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
+++ b/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/linuxbridge/test_linuxbridge_plugin.py b/quantum/tests/unit/linuxbridge/test_linuxbridge_plugin.py
index a4c1b48e0..da36a86a7 100644
--- a/quantum/tests/unit/linuxbridge/test_linuxbridge_plugin.py
+++ b/quantum/tests/unit/linuxbridge/test_linuxbridge_plugin.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/metaplugin/test_basic.py b/quantum/tests/unit/metaplugin/test_basic.py
index ecfdf2add..f627d66c9 100644
--- a/quantum/tests/unit/metaplugin/test_basic.py
+++ b/quantum/tests/unit/metaplugin/test_basic.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/nec/test_nec_plugin.py b/quantum/tests/unit/nec/test_nec_plugin.py
index 45a9f09c2..b510c0b0f 100644
--- a/quantum/tests/unit/nec/test_nec_plugin.py
+++ b/quantum/tests/unit/nec/test_nec_plugin.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/nicira/__init__.py b/quantum/tests/unit/nicira/__init__.py
index cbf4a4506..7e503debd 100644
--- a/quantum/tests/unit/nicira/__init__.py
+++ b/quantum/tests/unit/nicira/__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/quantum/tests/unit/nicira/test_nicira_plugin.py b/quantum/tests/unit/nicira/test_nicira_plugin.py
index e003bf27b..4103d5b4e 100644
--- a/quantum/tests/unit/nicira/test_nicira_plugin.py
+++ b/quantum/tests/unit/nicira/test_nicira_plugin.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/nicira/test_nvplib.py b/quantum/tests/unit/nicira/test_nvplib.py
index a0a1f9de1..4acfc3523 100644
--- a/quantum/tests/unit/nicira/test_nvplib.py
+++ b/quantum/tests/unit/nicira/test_nvplib.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/openvswitch/__init__.py b/quantum/tests/unit/openvswitch/__init__.py
index cbf4a4506..7e503debd 100644
--- a/quantum/tests/unit/openvswitch/__init__.py
+++ b/quantum/tests/unit/openvswitch/__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/quantum/tests/unit/openvswitch/test_agent_scheduler.py b/quantum/tests/unit/openvswitch/test_agent_scheduler.py
index d44b12968..14dc33ca1 100644
--- a/quantum/tests/unit/openvswitch/test_agent_scheduler.py
+++ b/quantum/tests/unit/openvswitch/test_agent_scheduler.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/openvswitch/test_openvswitch_plugin.py b/quantum/tests/unit/openvswitch/test_openvswitch_plugin.py
index d8aaed452..08bb85adb 100644
--- a/quantum/tests/unit/openvswitch/test_openvswitch_plugin.py
+++ b/quantum/tests/unit/openvswitch/test_openvswitch_plugin.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/openvswitch/test_ovs_db.py b/quantum/tests/unit/openvswitch/test_ovs_db.py
index 85768c106..0aa470ee9 100644
--- a/quantum/tests/unit/openvswitch/test_ovs_db.py
+++ b/quantum/tests/unit/openvswitch/test_ovs_db.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/openvswitch/test_ovs_defaults.py b/quantum/tests/unit/openvswitch/test_ovs_defaults.py
index 4429f3ea0..df6efa8d3 100644
--- a/quantum/tests/unit/openvswitch/test_ovs_defaults.py
+++ b/quantum/tests/unit/openvswitch/test_ovs_defaults.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/openvswitch/test_ovs_quantum_agent.py b/quantum/tests/unit/openvswitch/test_ovs_quantum_agent.py
index 41e9bc4a6..92407a4ee 100644
--- a/quantum/tests/unit/openvswitch/test_ovs_quantum_agent.py
+++ b/quantum/tests/unit/openvswitch/test_ovs_quantum_agent.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/ryu/__init__.py b/quantum/tests/unit/ryu/__init__.py
index cbf4a4506..7e503debd 100644
--- a/quantum/tests/unit/ryu/__init__.py
+++ b/quantum/tests/unit/ryu/__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/quantum/tests/unit/ryu/fake_ryu.py b/quantum/tests/unit/ryu/fake_ryu.py
index b915d8f11..994748f80 100644
--- a/quantum/tests/unit/ryu/fake_ryu.py
+++ b/quantum/tests/unit/ryu/fake_ryu.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/ryu/test_ryu_agent.py b/quantum/tests/unit/ryu/test_ryu_agent.py
index 223c4afe9..9cc7d3538 100644
--- a/quantum/tests/unit/ryu/test_ryu_agent.py
+++ b/quantum/tests/unit/ryu/test_ryu_agent.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/ryu/test_ryu_plugin.py b/quantum/tests/unit/ryu/test_ryu_plugin.py
index 9a3db8fd3..47f1ba357 100644
--- a/quantum/tests/unit/ryu/test_ryu_plugin.py
+++ b/quantum/tests/unit/ryu/test_ryu_plugin.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/services/agent_loadbalancer/test_plugin.py b/quantum/tests/unit/services/agent_loadbalancer/test_plugin.py
index 277a73925..081830dc0 100644
--- a/quantum/tests/unit/services/agent_loadbalancer/test_plugin.py
+++ b/quantum/tests/unit/services/agent_loadbalancer/test_plugin.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/quantum/tests/unit/test_agent_config.py b/quantum/tests/unit/test_agent_config.py
index 4cb3c48bf..fab746a31 100644
--- a/quantum/tests/unit/test_agent_config.py
+++ b/quantum/tests/unit/test_agent_config.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/quantum/tests/unit/test_agent_ext_plugin.py b/quantum/tests/unit/test_agent_ext_plugin.py
index 0501cdcce..5f0dbc0f4 100644
--- a/quantum/tests/unit/test_agent_ext_plugin.py
+++ b/quantum/tests/unit/test_agent_ext_plugin.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2013 OpenStack LLC.
+# Copyright (c) 2013 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/tests/unit/test_agent_netns_cleanup.py b/quantum/tests/unit/test_agent_netns_cleanup.py
index 243b93775..a9c5d559e 100644
--- a/quantum/tests/unit/test_agent_netns_cleanup.py
+++ b/quantum/tests/unit/test_agent_netns_cleanup.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/tests/unit/test_agent_ovs_cleanup.py b/quantum/tests/unit/test_agent_ovs_cleanup.py
index 8983a35a2..c13cc371f 100644
--- a/quantum/tests/unit/test_agent_ovs_cleanup.py
+++ b/quantum/tests/unit/test_agent_ovs_cleanup.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/tests/unit/test_agent_rpc.py b/quantum/tests/unit/test_agent_rpc.py
index 55a915504..fdbb1194f 100644
--- a/quantum/tests/unit/test_agent_rpc.py
+++ b/quantum/tests/unit/test_agent_rpc.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/tests/unit/test_api_v2.py b/quantum/tests/unit/test_api_v2.py
index c66495218..eb4725162 100644
--- a/quantum/tests/unit/test_api_v2.py
+++ b/quantum/tests/unit/test_api_v2.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/tests/unit/test_attributes.py b/quantum/tests/unit/test_attributes.py
index d91720ef3..76f99c96f 100644
--- a/quantum/tests/unit/test_attributes.py
+++ b/quantum/tests/unit/test_attributes.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/quantum/tests/unit/test_auth.py b/quantum/tests/unit/test_auth.py
index 14e620077..53d0f9211 100644
--- a/quantum/tests/unit/test_auth.py
+++ b/quantum/tests/unit/test_auth.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/quantum/tests/unit/test_common_utils.py b/quantum/tests/unit/test_common_utils.py
index d3cfd397f..9f615e969 100644
--- a/quantum/tests/unit/test_common_utils.py
+++ b/quantum/tests/unit/test_common_utils.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/test_config.py b/quantum/tests/unit/test_config.py
index 3194fcfab..d4e84bf4f 100644
--- a/quantum/tests/unit/test_config.py
+++ b/quantum/tests/unit/test_config.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/test_db.py b/quantum/tests/unit/test_db.py
index 9a9e6456e..43f3844e8 100644
--- a/quantum/tests/unit/test_db.py
+++ b/quantum/tests/unit/test_db.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/test_db_plugin.py b/quantum/tests/unit/test_db_plugin.py
index b8b61d590..edf85d3c2 100644
--- a/quantum/tests/unit/test_db_plugin.py
+++ b/quantum/tests/unit/test_db_plugin.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/tests/unit/test_db_rpc_base.py b/quantum/tests/unit/test_db_rpc_base.py
index 7039aa339..bb35f22d5 100644
--- a/quantum/tests/unit/test_db_rpc_base.py
+++ b/quantum/tests/unit/test_db_rpc_base.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/test_dhcp_agent.py b/quantum/tests/unit/test_dhcp_agent.py
index d2b0dbe86..46a6bdb9f 100644
--- a/quantum/tests/unit/test_dhcp_agent.py
+++ b/quantum/tests/unit/test_dhcp_agent.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/quantum/tests/unit/test_extension_portsecurity.py b/quantum/tests/unit/test_extension_portsecurity.py
index a68948adb..7a611cc46 100644
--- a/quantum/tests/unit/test_extension_portsecurity.py
+++ b/quantum/tests/unit/test_extension_portsecurity.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/test_extension_security_group.py b/quantum/tests/unit/test_extension_security_group.py
index ccb724a1f..f3aa3e7a3 100644
--- a/quantum/tests/unit/test_extension_security_group.py
+++ b/quantum/tests/unit/test_extension_security_group.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/test_extensions.py b/quantum/tests/unit/test_extensions.py
index 80dc099f1..7bead49fe 100644
--- a/quantum/tests/unit/test_extensions.py
+++ b/quantum/tests/unit/test_extensions.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/quantum/tests/unit/test_linux_dhcp.py b/quantum/tests/unit/test_linux_dhcp.py
index dabd1dcf8..a551c8fea 100644
--- a/quantum/tests/unit/test_linux_dhcp.py
+++ b/quantum/tests/unit/test_linux_dhcp.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/quantum/tests/unit/test_linux_interface.py b/quantum/tests/unit/test_linux_interface.py
index e913e60af..a386f9324 100644
--- a/quantum/tests/unit/test_linux_interface.py
+++ b/quantum/tests/unit/test_linux_interface.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/quantum/tests/unit/test_linux_ip_lib.py b/quantum/tests/unit/test_linux_ip_lib.py
index fd6979f49..47b40631d 100644
--- a/quantum/tests/unit/test_linux_ip_lib.py
+++ b/quantum/tests/unit/test_linux_ip_lib.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/quantum/tests/unit/test_loadbalancer_plugin.py b/quantum/tests/unit/test_loadbalancer_plugin.py
index 109043d74..4a5376825 100644
--- a/quantum/tests/unit/test_loadbalancer_plugin.py
+++ b/quantum/tests/unit/test_loadbalancer_plugin.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/quantum/tests/unit/test_policy.py b/quantum/tests/unit/test_policy.py
index 62421312f..8498a07aa 100644
--- a/quantum/tests/unit/test_policy.py
+++ b/quantum/tests/unit/test_policy.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 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/quantum/tests/unit/test_quantum_manager.py b/quantum/tests/unit/test_quantum_manager.py
index f7f60bcda..c17267370 100644
--- a/quantum/tests/unit/test_quantum_manager.py
+++ b/quantum/tests/unit/test_quantum_manager.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright (c) 2012 OpenStack, LLC.
+# Copyright (c) 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/quantum/tests/unit/test_rootwrap.py b/quantum/tests/unit/test_rootwrap.py
index 47de4f25f..7aeb66eb0 100644
--- a/quantum/tests/unit/test_rootwrap.py
+++ b/quantum/tests/unit/test_rootwrap.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/quantum/tests/unit/test_servicetype.py b/quantum/tests/unit/test_servicetype.py
index c9f3aeeb9..2e2eccc34 100644
--- a/quantum/tests/unit/test_servicetype.py
+++ b/quantum/tests/unit/test_servicetype.py
@@ -1,5 +1,5 @@
 # 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/quantum/tests/unit/test_wsgi.py b/quantum/tests/unit/test_wsgi.py
index c2759a65f..d98995ed3 100644
--- a/quantum/tests/unit/test_wsgi.py
+++ b/quantum/tests/unit/test_wsgi.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/quantum/tests/unit/testlib_api.py b/quantum/tests/unit/testlib_api.py
index 3e8f35361..eed2bd47c 100644
--- a/quantum/tests/unit/testlib_api.py
+++ b/quantum/tests/unit/testlib_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/quantum/version.py b/quantum/version.py
index b881430ca..1f006dc18 100644
--- a/quantum/version.py
+++ b/quantum/version.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/quantum/wsgi.py b/quantum/wsgi.py
index 58b9d156a..707751c0d 100644
--- a/quantum/wsgi.py
+++ b/quantum/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/run_tests.py b/run_tests.py
index 175764ad7..c93699b39 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010 OpenStack, LLC
+# Copyright 2010 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/setup.py b/setup.py
index b2bc55b9e..ed4367ae1 100644
--- a/setup.py
+++ b/setup.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.
diff --git a/tools/check_i18n.py b/tools/check_i18n.py
index 43a4f9bc3..705b2d3dd 100644
--- a/tools/check_i18n.py
+++ b/tools/check_i18n.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/tools/install_venv.py b/tools/install_venv.py
index b927989b1..ddb3d82c1 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -5,7 +5,7 @@
 # Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
-# Copyright 2010 OpenStack LLC.
+# Copyright 2010 OpenStack Foundation.
 # Copyright 2013 IBM Corp.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/tools/with_venv.sh b/tools/with_venv.sh
index 93eaa889f..5c4a271e4 100755
--- a/tools/with_venv.sh
+++ b/tools/with_venv.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # 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