diff --git a/bin/neutron-rootwrap-xen-dom0 b/bin/neutron-rootwrap-xen-dom0
index 5748f19be7..fd0b0c9895 100755
--- a/bin/neutron-rootwrap-xen-dom0
+++ b/bin/neutron-rootwrap-xen-dom0
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# 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-xen-dom0 b/bin/quantum-rootwrap-xen-dom0
index 5748f19be7..fd0b0c9895 100755
--- a/bin/quantum-rootwrap-xen-dom0
+++ b/bin/quantum-rootwrap-xen-dom0
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# 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/neutron/plugins/ml2/drivers/mech_arista/config.py b/neutron/plugins/ml2/drivers/mech_arista/config.py
index 5e3c60f86f..c4bdfe7c63 100644
--- a/neutron/plugins/ml2/drivers/mech_arista/config.py
+++ b/neutron/plugins/ml2/drivers/mech_arista/config.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/neutron/plugins/ml2/drivers/mech_arista/db.py b/neutron/plugins/ml2/drivers/mech_arista/db.py
index b13e1aa83e..aa26c09128 100644
--- a/neutron/plugins/ml2/drivers/mech_arista/db.py
+++ b/neutron/plugins/ml2/drivers/mech_arista/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/neutron/plugins/ml2/drivers/mech_arista/exceptions.py b/neutron/plugins/ml2/drivers/mech_arista/exceptions.py
index 65c1b5464d..b3dae3dae2 100644
--- a/neutron/plugins/ml2/drivers/mech_arista/exceptions.py
+++ b/neutron/plugins/ml2/drivers/mech_arista/exceptions.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/neutron/plugins/ml2/drivers/mech_arista/mechanism_arista.py b/neutron/plugins/ml2/drivers/mech_arista/mechanism_arista.py
index f8f2cbbab0..d6b1972f13 100644
--- a/neutron/plugins/ml2/drivers/mech_arista/mechanism_arista.py
+++ b/neutron/plugins/ml2/drivers/mech_arista/mechanism_arista.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/neutron/plugins/openvswitch/agent/xenapi/etc/xapi.d/plugins/netwrap b/neutron/plugins/openvswitch/agent/xenapi/etc/xapi.d/plugins/netwrap
index befe61f98a..6986ea483a 100644
--- a/neutron/plugins/openvswitch/agent/xenapi/etc/xapi.d/plugins/netwrap
+++ b/neutron/plugins/openvswitch/agent/xenapi/etc/xapi.d/plugins/netwrap
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright 2012 OpenStack LLC.
+# Copyright 2012 OpenStack Foundation
 # Copyright 2012 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
diff --git a/neutron/tests/unit/ml2/drivers/test_arista_mechanism_driver.py b/neutron/tests/unit/ml2/drivers/test_arista_mechanism_driver.py
index 5397f77b88..fcdb6976e3 100644
--- a/neutron/tests/unit/ml2/drivers/test_arista_mechanism_driver.py
+++ b/neutron/tests/unit/ml2/drivers/test_arista_mechanism_driver.py
@@ -1,5 +1,5 @@
 # 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/neutron/tests/unit/mlnx/test_agent_scheduler.py b/neutron/tests/unit/mlnx/test_agent_scheduler.py
index 4cfa878696..f53f40d3e4 100644
--- a/neutron/tests/unit/mlnx/test_agent_scheduler.py
+++ b/neutron/tests/unit/mlnx/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/neutron/tests/unit/mlnx/test_defaults.py b/neutron/tests/unit/mlnx/test_defaults.py
index 5dcbae9885..bfc0d268fc 100644
--- a/neutron/tests/unit/mlnx/test_defaults.py
+++ b/neutron/tests/unit/mlnx/test_defaults.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/neutron/tests/unit/mlnx/test_mlnx_db.py b/neutron/tests/unit/mlnx/test_mlnx_db.py
index 819af0ee7f..b79b871c42 100644
--- a/neutron/tests/unit/mlnx/test_mlnx_db.py
+++ b/neutron/tests/unit/mlnx/test_mlnx_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/neutron/tests/unit/mlnx/test_mlnx_plugin.py b/neutron/tests/unit/mlnx/test_mlnx_plugin.py
index f329a02030..ffa541fa36 100644
--- a/neutron/tests/unit/mlnx/test_mlnx_plugin.py
+++ b/neutron/tests/unit/mlnx/test_mlnx_plugin.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/neutron/tests/unit/mlnx/test_mlnx_security_group.py b/neutron/tests/unit/mlnx/test_mlnx_security_group.py
index f777196adb..9305241613 100644
--- a/neutron/tests/unit/mlnx/test_mlnx_security_group.py
+++ b/neutron/tests/unit/mlnx/test_mlnx_security_group.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.