diff --git a/Android.mk b/Android.mk
index 9db57c8ea85e8b1d35d516277e7fa8814b4d69f5..982e669287bc8844623d089238d183cce65ba17c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,7 +9,7 @@
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
 #       with the distribution.
-#     * Neither the name of Code Aurora Forum, Inc. nor the names of its
+#     * Neither the name of The Linux Foundation nor the names of its
 #       contributors may be used to endorse or promote products derived
 #       from this software without specific prior written permission.
 #
diff --git a/b2g_product.mk b/b2g_product.mk
index 8d1dc5ec3033828ec3409a76c7fd622c7f6b3e27..9a50be92056975ab010c4d77e74c85f378b3279b 100644
--- a/b2g_product.mk
+++ b/b2g_product.mk
@@ -9,7 +9,7 @@
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
 #       with the distribution.
-#     * Neither the name of Code Aurora Forum, Inc. nor the names of its
+#     * Neither the name of The Linux Foundation nor the names of its
 #       contributors may be used to endorse or promote products derived
 #       from this software without specific prior written permission.
 #
diff --git a/faketools/aapt b/faketools/aapt
index d75f19f1bf80420ad6b80c6d2c16da5fcc0b0771..da4c17ebe5d6d8f28cb780d269a00ea1f550779d 100755
--- a/faketools/aapt
+++ b/faketools/aapt
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+# Copyright (c) 2012, The Linux Foundation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -11,7 +11,7 @@
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
 #       with the distribution.
-#     * Neither the name of Code Aurora Forum, Inc. nor the names of its
+#     * Neither the name of The Linux Foundation nor the names of its
 #       contributors may be used to endorse or promote products derived
 #       from this software without specific prior written permission.
 #
diff --git a/faketools/dx b/faketools/dx
index 14a14fd536967c55eb4807cf26c55ec3b53c0cf0..fff87c84e6b502cc472ddd62641f1be32b1fadde 100755
--- a/faketools/dx
+++ b/faketools/dx
@@ -11,7 +11,7 @@
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
 #       with the distribution.
-#     * Neither the name of Code Aurora Forum, Inc. nor the names of its
+#     * Neither the name of The Linux Foundation nor the names of its
 #       contributors may be used to endorse or promote products derived
 #       from this software without specific prior written permission.
 #
diff --git a/faketools/jdk/bin/jar b/faketools/jdk/bin/jar
index e3355af91bb52477cc483ac2ca69766fd4cd268f..600a30763af8eef6a2e8ea477a68d6df1eb6b1ba 100755
--- a/faketools/jdk/bin/jar
+++ b/faketools/jdk/bin/jar
@@ -11,7 +11,7 @@
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
 #       with the distribution.
-#     * Neither the name of Code Aurora Forum, Inc. nor the names of its
+#     * Neither the name of The Linux Foundation nor the names of its
 #       contributors may be used to endorse or promote products derived
 #       from this software without specific prior written permission.
 #
diff --git a/faketools/jdk/bin/java b/faketools/jdk/bin/java
index 305a938d4dbd1d616667fc958927249bf29de607..dd6f75166f9fe5b4bf9cee3b6d78ccedf7a00ba7 100755
--- a/faketools/jdk/bin/java
+++ b/faketools/jdk/bin/java
@@ -11,7 +11,7 @@
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
 #       with the distribution.
-#     * Neither the name of Code Aurora Forum, Inc. nor the names of its
+#     * Neither the name of The Linux Foundation nor the names of its
 #       contributors may be used to endorse or promote products derived
 #       from this software without specific prior written permission.
 #
diff --git a/faketools/jdk/bin/javac b/faketools/jdk/bin/javac
index eb2d149037eb7839ec0196f8d37cd1d8a6263708..4a406fe8bc824825c72e1dd01f3afe3ac3a6c3be 100755
--- a/faketools/jdk/bin/javac
+++ b/faketools/jdk/bin/javac
@@ -11,7 +11,7 @@
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
 #       with the distribution.
-#     * Neither the name of Code Aurora Forum, Inc. nor the names of its
+#     * Neither the name of The Linux Foundation nor the names of its
 #       contributors may be used to endorse or promote products derived
 #       from this software without specific prior written permission.
 #
diff --git a/faketools/jdk/bin/javadoc b/faketools/jdk/bin/javadoc
index c45026a45f3914a5a72df532257639dd6403f4b5..9c39ec6ace512aa2e435b1ec785a061e09ca1aff 100755
--- a/faketools/jdk/bin/javadoc
+++ b/faketools/jdk/bin/javadoc
@@ -11,7 +11,7 @@
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
 #       with the distribution.
-#     * Neither the name of Code Aurora Forum, Inc. nor the names of its
+#     * Neither the name of The Linux Foundation nor the names of its
 #       contributors may be used to endorse or promote products derived
 #       from this software without specific prior written permission.
 #
diff --git a/keymaps/keymaps.mk b/keymaps/keymaps.mk
index a37d93fc3d3a86a97b887514900f004deac60dab..c24b985cfc59f10b12d47fc98337da0f8d5e0f6d 100644
--- a/keymaps/keymaps.mk
+++ b/keymaps/keymaps.mk
@@ -9,7 +9,7 @@
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
 #       with the distribution.
-#     * Neither the name of Code Aurora Forum, Inc. nor the names of its
+#     * Neither the name of The Linux Foundation nor the names of its
 #       contributors may be used to endorse or promote products derived
 #       from this software without specific prior written permission.
 #
diff --git a/treeid.sh b/treeid.sh
index 7bbcf7597a8d31901a5f10bfbe9e31b3d9b25f41..6db6792db248ead21777b6606b0c5c30a2fbe430 100755
--- a/treeid.sh
+++ b/treeid.sh
@@ -14,7 +14,7 @@
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
 #       with the distribution.
-#     * Neither the name of Code Aurora Forum, Inc. nor the names of its
+#     * Neither the name of The Linux Foundation nor the names of its
 #       contributors may be used to endorse or promote products derived
 #       from this software without specific prior written permission.
 #
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 9ad211afa57ed4151466fb78413b4c6cfca20884..33fba58697c2a07c4f0483bf77aec5d1c04f0427 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -9,7 +9,7 @@
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
 #       with the distribution.
-#     * Neither the name of Code Aurora Forum, Inc. nor the names of its
+#     * Neither the name of The Linux Foundation nor the names of its
 #       contributors may be used to endorse or promote products derived
 #       from this software without specific prior written permission.
 #