diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bf2e9bf7d32..57ebe4322be 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -52,4 +52,4 @@ will complain.
 ## License
 
 By contributing to ReDex, you agree that your contributions will be licensed
-under its BSD license.
+under its MIT license.
diff --git a/LICENSE b/LICENSE
index 604243536b6..b96dcb0480a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,30 +1,21 @@
-BSD License
+MIT License
 
-For ReDex software
+Copyright (c) Facebook, Inc. and its affiliates.
 
-Copyright (c) 2016-present, Facebook, Inc. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
- * Neither the name Facebook nor the names of its contributors may be used to
-   endorse or promote products derived from this software without specific
-   prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/PATENTS b/PATENTS
deleted file mode 100644
index 27122dc1a3c..00000000000
--- a/PATENTS
+++ /dev/null
@@ -1,33 +0,0 @@
-Additional Grant of Patent Rights Version 2
-
-"Software" means the ReDex software distributed by Facebook, Inc.
-
-Facebook, Inc. ("Facebook") hereby grants to each recipient of the Software
-("you") a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
-(subject to the termination provision below) license under any Necessary
-Claims, to make, have made, use, sell, offer to sell, import, and otherwise
-transfer the Software. For avoidance of doubt, no license is granted under
-Facebook’s rights in any patent claims that are infringed by (i) modifications
-to the Software made by you or any third party or (ii) the Software in
-combination with any software or other technology.
-
-The license granted hereunder will terminate, automatically and without notice,
-if you (or any of your subsidiaries, corporate affiliates or agents) initiate
-directly or indirectly, or take a direct financial interest in, any Patent
-Assertion: (i) against Facebook or any of its subsidiaries or corporate
-affiliates, (ii) against any party if such Patent Assertion arises in whole or
-in part from any software, technology, product or service of Facebook or any of
-its subsidiaries or corporate affiliates, or (iii) against any party relating
-to the Software. Notwithstanding the foregoing, if Facebook or any of its
-subsidiaries or corporate affiliates files a lawsuit alleging patent
-infringement against you in the first instance, and you respond by filing a
-patent infringement counterclaim in that lawsuit against that party that is
-unrelated to the Software, the license granted hereunder will not terminate
-under section (i) of this paragraph due to such counterclaim.
-
-A "Necessary Claim" is a claim of a patent owned by Facebook that is
-necessarily infringed by the Software standing alone.
-
-A "Patent Assertion" is any lawsuit or other action alleging direct, indirect,
-or contributory infringement or inducement to infringe any patent, including a
-cross-claim or counterclaim.
diff --git a/README.md b/README.md
index e74e4ce158a..1d62a39ac82 100644
--- a/README.md
+++ b/README.md
@@ -172,7 +172,8 @@ likely to be addressed.
 
 # License
 
-ReDex is BSD-licensed.  We also provide an additional patent grant.
+ReDex is MIT-licensed, see the LICENSE file in the root directory of this
+source tree.
 
 ---
 
diff --git a/apkutil b/apkutil
index dbecd66b3cf..f51197df6e8 100755
--- a/apkutil
+++ b/apkutil
@@ -1,11 +1,9 @@
 #!/usr/bin/env python
 
-# Copyright (c) 2016-present, Facebook, Inc.
-# All rights reserved.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 from __future__ import absolute_import
 from __future__ import division
diff --git a/docs/examples/ProguardExample/app/src/main/java/com/facebook/redex/examples/proguardexample/Alpha.java b/docs/examples/ProguardExample/app/src/main/java/com/facebook/redex/examples/proguardexample/Alpha.java
index 44ec6bf57d2..409d3c037ff 100644
--- a/docs/examples/ProguardExample/app/src/main/java/com/facebook/redex/examples/proguardexample/Alpha.java
+++ b/docs/examples/ProguardExample/app/src/main/java/com/facebook/redex/examples/proguardexample/Alpha.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.examples.proguardexample;
diff --git a/docs/examples/ProguardExample/app/src/main/java/com/facebook/redex/examples/proguardexample/Greek.java b/docs/examples/ProguardExample/app/src/main/java/com/facebook/redex/examples/proguardexample/Greek.java
index 8f973fc22e3..40021261dcb 100644
--- a/docs/examples/ProguardExample/app/src/main/java/com/facebook/redex/examples/proguardexample/Greek.java
+++ b/docs/examples/ProguardExample/app/src/main/java/com/facebook/redex/examples/proguardexample/Greek.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.examples.proguardexample;
diff --git a/docs/examples/ProguardExample/app/src/main/java/com/facebook/redex/examples/proguardexample/MainActivity.java b/docs/examples/ProguardExample/app/src/main/java/com/facebook/redex/examples/proguardexample/MainActivity.java
index cd9528b8ce8..8bf41250af7 100644
--- a/docs/examples/ProguardExample/app/src/main/java/com/facebook/redex/examples/proguardexample/MainActivity.java
+++ b/docs/examples/ProguardExample/app/src/main/java/com/facebook/redex/examples/proguardexample/MainActivity.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.examples.proguardexample;
diff --git a/docs/examples/Synth/synth-example/src/main/java/com/facebook/redex/examples/synth/Alpha.java b/docs/examples/Synth/synth-example/src/main/java/com/facebook/redex/examples/synth/Alpha.java
index 71fbcbc5814..e452df01ef3 100644
--- a/docs/examples/Synth/synth-example/src/main/java/com/facebook/redex/examples/synth/Alpha.java
+++ b/docs/examples/Synth/synth-example/src/main/java/com/facebook/redex/examples/synth/Alpha.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.examples.synth;
diff --git a/docs/examples/Synth/synth-example/src/main/java/com/facebook/redex/examples/synth/MainActivity.java b/docs/examples/Synth/synth-example/src/main/java/com/facebook/redex/examples/synth/MainActivity.java
index 03021130094..06378e39d3f 100644
--- a/docs/examples/Synth/synth-example/src/main/java/com/facebook/redex/examples/synth/MainActivity.java
+++ b/docs/examples/Synth/synth-example/src/main/java/com/facebook/redex/examples/synth/MainActivity.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.examples.synth;
diff --git a/libredex/ApkManager.cpp b/libredex/ApkManager.cpp
index a5c0c4255c0..6a196cc748a 100644
--- a/libredex/ApkManager.cpp
+++ b/libredex/ApkManager.cpp
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) Facebook, Inc. and its affiliates.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #include "ApkManager.h"
 
diff --git a/libredex/ApkManager.h b/libredex/ApkManager.h
index ae19673ef67..7de2f52b164 100644
--- a/libredex/ApkManager.h
+++ b/libredex/ApkManager.h
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) Facebook, Inc. and its affiliates.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #pragma once
 
diff --git a/libredex/CallGraph.cpp b/libredex/CallGraph.cpp
index f1e645fc830..bf3cd061766 100644
--- a/libredex/CallGraph.cpp
+++ b/libredex/CallGraph.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "CallGraph.h"
diff --git a/libredex/CallGraph.h b/libredex/CallGraph.h
index f4113f7e26d..289199898f5 100644
--- a/libredex/CallGraph.h
+++ b/libredex/CallGraph.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/ClassHierarchy.cpp b/libredex/ClassHierarchy.cpp
index 99c4c6474f1..d9f16a013ce 100644
--- a/libredex/ClassHierarchy.cpp
+++ b/libredex/ClassHierarchy.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ClassHierarchy.h"
diff --git a/libredex/ClassHierarchy.h b/libredex/ClassHierarchy.h
index e789f13340a..c32c272d3dc 100644
--- a/libredex/ClassHierarchy.h
+++ b/libredex/ClassHierarchy.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/ConcurrentContainers.h b/libredex/ConcurrentContainers.h
index 6a72c77f73b..6c5e9b55490 100644
--- a/libredex/ConcurrentContainers.h
+++ b/libredex/ConcurrentContainers.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/ConfigFiles.cpp b/libredex/ConfigFiles.cpp
index 5ddfd9acdb9..ce0069713ea 100644
--- a/libredex/ConfigFiles.cpp
+++ b/libredex/ConfigFiles.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ConfigFiles.h"
diff --git a/libredex/ConfigFiles.h b/libredex/ConfigFiles.h
index f984bde88fb..2adc0672188 100644
--- a/libredex/ConfigFiles.h
+++ b/libredex/ConfigFiles.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/ControlFlow.cpp b/libredex/ControlFlow.cpp
index b61d1dd6044..71ab7d199b4 100644
--- a/libredex/ControlFlow.cpp
+++ b/libredex/ControlFlow.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ControlFlow.h"
diff --git a/libredex/ControlFlow.h b/libredex/ControlFlow.h
index e3c66b4a2d2..332ff67f1fa 100644
--- a/libredex/ControlFlow.h
+++ b/libredex/ControlFlow.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/Creators.cpp b/libredex/Creators.cpp
index 3f565ea4317..d301421dc21 100644
--- a/libredex/Creators.cpp
+++ b/libredex/Creators.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Creators.h"
diff --git a/libredex/Creators.h b/libredex/Creators.h
index af43cda314c..729370e8c7f 100644
--- a/libredex/Creators.h
+++ b/libredex/Creators.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/Dataflow.h b/libredex/Dataflow.h
index b1f512b9844..39b00089172 100644
--- a/libredex/Dataflow.h
+++ b/libredex/Dataflow.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ControlFlow.h"
diff --git a/libredex/Debug.cpp b/libredex/Debug.cpp
index e11cba2d15c..1436455d9a0 100644
--- a/libredex/Debug.cpp
+++ b/libredex/Debug.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Debug.h"
diff --git a/libredex/Debug.h b/libredex/Debug.h
index 711b8a159d3..451636eba15 100644
--- a/libredex/Debug.h
+++ b/libredex/Debug.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/DexAccess.h b/libredex/DexAccess.h
index 4d470cdba3c..27171b25665 100644
--- a/libredex/DexAccess.h
+++ b/libredex/DexAccess.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/DexAnnotation.cpp b/libredex/DexAnnotation.cpp
index 281aced2ff0..fccf1f69221 100644
--- a/libredex/DexAnnotation.cpp
+++ b/libredex/DexAnnotation.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "DexClass.h"
diff --git a/libredex/DexAnnotation.h b/libredex/DexAnnotation.h
index 86b2fc7bd21..b4a625f9de9 100644
--- a/libredex/DexAnnotation.h
+++ b/libredex/DexAnnotation.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/DexAsm.cpp b/libredex/DexAsm.cpp
index 61c5d69d007..ef8b0e4616c 100644
--- a/libredex/DexAsm.cpp
+++ b/libredex/DexAsm.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "DexAsm.h"
diff --git a/libredex/DexAsm.h b/libredex/DexAsm.h
index 92903d73106..64a6b096de1 100644
--- a/libredex/DexAsm.h
+++ b/libredex/DexAsm.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/DexClass.cpp b/libredex/DexClass.cpp
index 91ae2906860..f1d7f764b91 100644
--- a/libredex/DexClass.cpp
+++ b/libredex/DexClass.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "DexClass.h"
diff --git a/libredex/DexClass.h b/libredex/DexClass.h
index 63df3029a6a..c09f12c163f 100644
--- a/libredex/DexClass.h
+++ b/libredex/DexClass.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/DexDebugInstruction.cpp b/libredex/DexDebugInstruction.cpp
index 96c76ab049c..7e31a8a544c 100644
--- a/libredex/DexDebugInstruction.cpp
+++ b/libredex/DexDebugInstruction.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <sstream>
diff --git a/libredex/DexDebugInstruction.h b/libredex/DexDebugInstruction.h
index 97775e8eee2..9cd5716f1b0 100644
--- a/libredex/DexDebugInstruction.h
+++ b/libredex/DexDebugInstruction.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/DexEncoding.cpp b/libredex/DexEncoding.cpp
index 961888bc60a..213967b4406 100644
--- a/libredex/DexEncoding.cpp
+++ b/libredex/DexEncoding.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
-#include "DexEncoding.h"
\ No newline at end of file
+#include "DexEncoding.h"
diff --git a/libredex/DexIdx.cpp b/libredex/DexIdx.cpp
index 0d81178ceae..9788d628054 100644
--- a/libredex/DexIdx.cpp
+++ b/libredex/DexIdx.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "DexIdx.h"
diff --git a/libredex/DexIdx.h b/libredex/DexIdx.h
index 91b5784d842..82e429d9a55 100644
--- a/libredex/DexIdx.h
+++ b/libredex/DexIdx.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/DexInstruction.cpp b/libredex/DexInstruction.cpp
index 961f4211dc4..ea18022f0c2 100644
--- a/libredex/DexInstruction.cpp
+++ b/libredex/DexInstruction.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "DexInstruction.h"
diff --git a/libredex/DexInstruction.h b/libredex/DexInstruction.h
index eea03ec8bdf..3fe9ada9723 100644
--- a/libredex/DexInstruction.h
+++ b/libredex/DexInstruction.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/DexLoader.cpp b/libredex/DexLoader.cpp
index c424f003ad9..1426e94577f 100644
--- a/libredex/DexLoader.cpp
+++ b/libredex/DexLoader.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <boost/iostreams/device/mapped_file.hpp>
diff --git a/libredex/DexLoader.h b/libredex/DexLoader.h
index dba417b42b4..d5e7395bcd3 100644
--- a/libredex/DexLoader.h
+++ b/libredex/DexLoader.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/DexMemberRefs.cpp b/libredex/DexMemberRefs.cpp
index ebbdb713cc6..2f613023e84 100644
--- a/libredex/DexMemberRefs.cpp
+++ b/libredex/DexMemberRefs.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "DexMemberRefs.h"
diff --git a/libredex/DexMemberRefs.h b/libredex/DexMemberRefs.h
index 98b206a95b8..dffb919ce8c 100644
--- a/libredex/DexMemberRefs.h
+++ b/libredex/DexMemberRefs.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/DexOpcode.cpp b/libredex/DexOpcode.cpp
index e3d44a522f1..28bd02742e0 100644
--- a/libredex/DexOpcode.cpp
+++ b/libredex/DexOpcode.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "DexOpcode.h"
diff --git a/libredex/DexOpcode.h b/libredex/DexOpcode.h
index 9d6114a5b87..bcaf109892b 100644
--- a/libredex/DexOpcode.h
+++ b/libredex/DexOpcode.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/DexOutput.cpp b/libredex/DexOutput.cpp
index 3ff03cb8851..61502013f6d 100644
--- a/libredex/DexOutput.cpp
+++ b/libredex/DexOutput.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <algorithm>
diff --git a/libredex/DexOutput.h b/libredex/DexOutput.h
index 5d66b305658..a00b0d04de7 100644
--- a/libredex/DexOutput.h
+++ b/libredex/DexOutput.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/DexPosition.cpp b/libredex/DexPosition.cpp
index ad6713e401c..e2f13a4e92c 100644
--- a/libredex/DexPosition.cpp
+++ b/libredex/DexPosition.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <fstream>
diff --git a/libredex/DexPosition.h b/libredex/DexPosition.h
index 79a34df1732..7f1c2a3273e 100644
--- a/libredex/DexPosition.h
+++ b/libredex/DexPosition.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/DexStore.cpp b/libredex/DexStore.cpp
index 774269b6a77..a0a1668f1c3 100644
--- a/libredex/DexStore.cpp
+++ b/libredex/DexStore.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 #include <json/json.h>
 #include <iostream>
diff --git a/libredex/DexStore.h b/libredex/DexStore.h
index 7e45a63d32f..452d89af37e 100644
--- a/libredex/DexStore.h
+++ b/libredex/DexStore.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/DexUtil.cpp b/libredex/DexUtil.cpp
index e2234a814f6..fd2562b24ad 100644
--- a/libredex/DexUtil.cpp
+++ b/libredex/DexUtil.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "DexUtil.h"
diff --git a/libredex/DexUtil.h b/libredex/DexUtil.h
index 664cb54b163..31b28ce1a3b 100644
--- a/libredex/DexUtil.h
+++ b/libredex/DexUtil.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/Gatherable.h b/libredex/Gatherable.h
index bd95bf54583..7aeb6659a4c 100644
--- a/libredex/Gatherable.h
+++ b/libredex/Gatherable.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/IRAssembler.cpp b/libredex/IRAssembler.cpp
index d3be4da0b4c..25ae781c428 100644
--- a/libredex/IRAssembler.cpp
+++ b/libredex/IRAssembler.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "IRAssembler.h"
diff --git a/libredex/IRAssembler.h b/libredex/IRAssembler.h
index 8e7268dbbb0..6e971be1048 100644
--- a/libredex/IRAssembler.h
+++ b/libredex/IRAssembler.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/IRCode.cpp b/libredex/IRCode.cpp
index 45148f095c6..b68ec5cc115 100644
--- a/libredex/IRCode.cpp
+++ b/libredex/IRCode.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "IRCode.h"
diff --git a/libredex/IRCode.h b/libredex/IRCode.h
index deee5090169..21b7099c650 100644
--- a/libredex/IRCode.h
+++ b/libredex/IRCode.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/IRInstruction.cpp b/libredex/IRInstruction.cpp
index 84bfeffd3d2..f1dd3026ae9 100644
--- a/libredex/IRInstruction.cpp
+++ b/libredex/IRInstruction.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "IRInstruction.h"
diff --git a/libredex/IRInstruction.h b/libredex/IRInstruction.h
index 9114aaffbd2..525a8d33b68 100644
--- a/libredex/IRInstruction.h
+++ b/libredex/IRInstruction.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/IRList.cpp b/libredex/IRList.cpp
index be4b2079c12..287cc4a9fe1 100644
--- a/libredex/IRList.cpp
+++ b/libredex/IRList.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "IRList.h"
diff --git a/libredex/IRList.h b/libredex/IRList.h
index fde0cd5af9f..e5ddf52fe71 100644
--- a/libredex/IRList.h
+++ b/libredex/IRList.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/IROpcode.cpp b/libredex/IROpcode.cpp
index 6567e71e5b4..2a2e1b2d9ea 100644
--- a/libredex/IROpcode.cpp
+++ b/libredex/IROpcode.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "IROpcode.h"
diff --git a/libredex/IROpcode.h b/libredex/IROpcode.h
index b1224f7c252..aae8073d10c 100644
--- a/libredex/IROpcode.h
+++ b/libredex/IROpcode.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/IRTypeChecker.cpp b/libredex/IRTypeChecker.cpp
index ea99050c80c..b726f99ce39 100644
--- a/libredex/IRTypeChecker.cpp
+++ b/libredex/IRTypeChecker.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "IRTypeChecker.h"
diff --git a/libredex/IRTypeChecker.h b/libredex/IRTypeChecker.h
index df0d1db7e1a..3c59fe5a5c6 100644
--- a/libredex/IRTypeChecker.h
+++ b/libredex/IRTypeChecker.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/ImmutableSubcomponentAnalyzer.cpp b/libredex/ImmutableSubcomponentAnalyzer.cpp
index 10d80b192cd..abdba7dc969 100644
--- a/libredex/ImmutableSubcomponentAnalyzer.cpp
+++ b/libredex/ImmutableSubcomponentAnalyzer.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ImmutableSubcomponentAnalyzer.h"
diff --git a/libredex/ImmutableSubcomponentAnalyzer.h b/libredex/ImmutableSubcomponentAnalyzer.h
index b4d53070cf3..a86687bce75 100644
--- a/libredex/ImmutableSubcomponentAnalyzer.h
+++ b/libredex/ImmutableSubcomponentAnalyzer.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/Inliner.cpp b/libredex/Inliner.cpp
index f8caf668da3..8f5a61aa5c3 100644
--- a/libredex/Inliner.cpp
+++ b/libredex/Inliner.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Inliner.h"
diff --git a/libredex/Inliner.h b/libredex/Inliner.h
index 2c9c4fc8f24..7ec8d539971 100644
--- a/libredex/Inliner.h
+++ b/libredex/Inliner.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/InstructionAnalyzer.h b/libredex/InstructionAnalyzer.h
index 1c1054be0f7..6baa41e4a8c 100644
--- a/libredex/InstructionAnalyzer.h
+++ b/libredex/InstructionAnalyzer.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/InstructionLowering.cpp b/libredex/InstructionLowering.cpp
index 0b3589ad237..27a327b1e4c 100644
--- a/libredex/InstructionLowering.cpp
+++ b/libredex/InstructionLowering.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "InstructionLowering.h"
diff --git a/libredex/InstructionLowering.h b/libredex/InstructionLowering.h
index 3650d7d9835..9b0a705f719 100644
--- a/libredex/InstructionLowering.h
+++ b/libredex/InstructionLowering.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/JarLoader.cpp b/libredex/JarLoader.cpp
index 9ba6f906e15..671e02c8a04 100644
--- a/libredex/JarLoader.cpp
+++ b/libredex/JarLoader.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <boost/iostreams/device/mapped_file.hpp>
diff --git a/libredex/JarLoader.h b/libredex/JarLoader.h
index 1d1ff7611b4..dae4541aa96 100644
--- a/libredex/JarLoader.h
+++ b/libredex/JarLoader.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/Match.cpp b/libredex/Match.cpp
index 97a1eaad2a4..594449face1 100644
--- a/libredex/Match.cpp
+++ b/libredex/Match.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Match.h"
diff --git a/libredex/Match.h b/libredex/Match.h
index e85ca761321..c2ad35a036c 100644
--- a/libredex/Match.h
+++ b/libredex/Match.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/MethodDevirtualizer.cpp b/libredex/MethodDevirtualizer.cpp
index 003f913c523..2e2830acbb7 100644
--- a/libredex/MethodDevirtualizer.cpp
+++ b/libredex/MethodDevirtualizer.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "MethodDevirtualizer.h"
diff --git a/libredex/MethodDevirtualizer.h b/libredex/MethodDevirtualizer.h
index 91ea462e1f9..f13b105e266 100644
--- a/libredex/MethodDevirtualizer.h
+++ b/libredex/MethodDevirtualizer.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/Mutators.cpp b/libredex/Mutators.cpp
index 9fe6621c8d6..9c6422acc97 100644
--- a/libredex/Mutators.cpp
+++ b/libredex/Mutators.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "DexUtil.h"
diff --git a/libredex/Mutators.h b/libredex/Mutators.h
index f6cfc323356..b740e21db0f 100644
--- a/libredex/Mutators.h
+++ b/libredex/Mutators.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "DexClass.h"
diff --git a/libredex/Pass.h b/libredex/Pass.h
index b22ab5131c0..a3e8e7d5aa5 100644
--- a/libredex/Pass.h
+++ b/libredex/Pass.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/PassManager.cpp b/libredex/PassManager.cpp
index 97997506b88..f24b1fbab8f 100644
--- a/libredex/PassManager.cpp
+++ b/libredex/PassManager.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "PassManager.h"
diff --git a/libredex/PassManager.h b/libredex/PassManager.h
index b7e315ed9a9..4e3ecab68ce 100644
--- a/libredex/PassManager.h
+++ b/libredex/PassManager.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/PassRegistry.cpp b/libredex/PassRegistry.cpp
index d429075fb57..cad4a1618d2 100644
--- a/libredex/PassRegistry.cpp
+++ b/libredex/PassRegistry.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "PassRegistry.h"
diff --git a/libredex/PassRegistry.h b/libredex/PassRegistry.h
index 7e6799dfc80..49ce51f9628 100644
--- a/libredex/PassRegistry.h
+++ b/libredex/PassRegistry.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/PluginRegistry.cpp b/libredex/PluginRegistry.cpp
index f7c4e0ced15..52384de4853 100644
--- a/libredex/PluginRegistry.cpp
+++ b/libredex/PluginRegistry.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "PluginRegistry.h"
diff --git a/libredex/PluginRegistry.h b/libredex/PluginRegistry.h
index 76dd2f1cced..3fef9318c69 100644
--- a/libredex/PluginRegistry.h
+++ b/libredex/PluginRegistry.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/PointsToSemantics.cpp b/libredex/PointsToSemantics.cpp
index 1d1dedb2ea1..185e34acac2 100644
--- a/libredex/PointsToSemantics.cpp
+++ b/libredex/PointsToSemantics.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "PointsToSemantics.h"
diff --git a/libredex/PointsToSemantics.h b/libredex/PointsToSemantics.h
index 5f1c3188338..d6c5b94013e 100644
--- a/libredex/PointsToSemantics.h
+++ b/libredex/PointsToSemantics.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/PointsToSemanticsUtils.cpp b/libredex/PointsToSemanticsUtils.cpp
index 8f1a3a4263e..2f7259b55fb 100644
--- a/libredex/PointsToSemanticsUtils.cpp
+++ b/libredex/PointsToSemanticsUtils.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "PointsToSemanticsUtils.h"
diff --git a/libredex/PointsToSemanticsUtils.h b/libredex/PointsToSemanticsUtils.h
index b96b28cd234..5d967b35ab1 100644
--- a/libredex/PointsToSemanticsUtils.h
+++ b/libredex/PointsToSemanticsUtils.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/PrintSeeds.cpp b/libredex/PrintSeeds.cpp
index f7bf7dc269b..fa9a0822510 100644
--- a/libredex/PrintSeeds.cpp
+++ b/libredex/PrintSeeds.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "PrintSeeds.h"
diff --git a/libredex/PrintSeeds.h b/libredex/PrintSeeds.h
index 166cc3cd283..c8ec95a82c5 100644
--- a/libredex/PrintSeeds.h
+++ b/libredex/PrintSeeds.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/ProguardConfiguration.h b/libredex/ProguardConfiguration.h
index c9186a4449b..9fad0e8cd56 100644
--- a/libredex/ProguardConfiguration.h
+++ b/libredex/ProguardConfiguration.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/ProguardLexer.cpp b/libredex/ProguardLexer.cpp
index 8d7351afe7f..e7a7df1d274 100644
--- a/libredex/ProguardLexer.cpp
+++ b/libredex/ProguardLexer.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cctype>
diff --git a/libredex/ProguardLexer.h b/libredex/ProguardLexer.h
index a1173f90c3f..f2f8db3cf31 100644
--- a/libredex/ProguardLexer.h
+++ b/libredex/ProguardLexer.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/libredex/ProguardMap.cpp b/libredex/ProguardMap.cpp
index 76ea869be15..be9172b941e 100644
--- a/libredex/ProguardMap.cpp
+++ b/libredex/ProguardMap.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ProguardMap.h"
diff --git a/libredex/ProguardMap.h b/libredex/ProguardMap.h
index aee75d78470..3099f1a52f8 100644
--- a/libredex/ProguardMap.h
+++ b/libredex/ProguardMap.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/ProguardMatcher.cpp b/libredex/ProguardMatcher.cpp
index 5f0c02465c1..5f7183ed0bc 100644
--- a/libredex/ProguardMatcher.cpp
+++ b/libredex/ProguardMatcher.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <boost/regex.hpp>
diff --git a/libredex/ProguardMatcher.h b/libredex/ProguardMatcher.h
index ea8d4d44797..b5223cfef34 100644
--- a/libredex/ProguardMatcher.h
+++ b/libredex/ProguardMatcher.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/ProguardParser.cpp b/libredex/ProguardParser.cpp
index 2464ce9f507..ee04e7e6c40 100644
--- a/libredex/ProguardParser.cpp
+++ b/libredex/ProguardParser.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <fstream>
diff --git a/libredex/ProguardParser.h b/libredex/ProguardParser.h
index 948fe03ebb6..c654445c42f 100644
--- a/libredex/ProguardParser.h
+++ b/libredex/ProguardParser.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/ProguardPrintConfiguration.cpp b/libredex/ProguardPrintConfiguration.cpp
index 12902aac296..b4cb0fc5b5f 100644
--- a/libredex/ProguardPrintConfiguration.cpp
+++ b/libredex/ProguardPrintConfiguration.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ProguardPrintConfiguration.h"
diff --git a/libredex/ProguardPrintConfiguration.h b/libredex/ProguardPrintConfiguration.h
index 8c25b5c5399..528dd8dce6b 100644
--- a/libredex/ProguardPrintConfiguration.h
+++ b/libredex/ProguardPrintConfiguration.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/ProguardRegex.cpp b/libredex/ProguardRegex.cpp
index b79be3ff989..d4866cc833d 100644
--- a/libredex/ProguardRegex.cpp
+++ b/libredex/ProguardRegex.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cstring>
diff --git a/libredex/ProguardRegex.h b/libredex/ProguardRegex.h
index c3cbef0d4ba..4cd8956b4c3 100644
--- a/libredex/ProguardRegex.h
+++ b/libredex/ProguardRegex.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/ProguardReporting.cpp b/libredex/ProguardReporting.cpp
index 29ca25846a1..190a79b4d4b 100644
--- a/libredex/ProguardReporting.cpp
+++ b/libredex/ProguardReporting.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ProguardReporting.h"
diff --git a/libredex/ProguardReporting.h b/libredex/ProguardReporting.h
index edd0ba10258..d7f2150a0fc 100644
--- a/libredex/ProguardReporting.h
+++ b/libredex/ProguardReporting.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/ReachableClasses.cpp b/libredex/ReachableClasses.cpp
index 63dce10e3a3..295155b162f 100644
--- a/libredex/ReachableClasses.cpp
+++ b/libredex/ReachableClasses.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ReachableClasses.h"
diff --git a/libredex/ReachableClasses.h b/libredex/ReachableClasses.h
index e801fb032ab..c2a3bb1902a 100644
--- a/libredex/ReachableClasses.h
+++ b/libredex/ReachableClasses.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/ReachableObjects.cpp b/libredex/ReachableObjects.cpp
index 96707579e79..63fb7e97777 100644
--- a/libredex/ReachableObjects.cpp
+++ b/libredex/ReachableObjects.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ReachableObjects.h"
diff --git a/libredex/ReachableObjects.h b/libredex/ReachableObjects.h
index 2bb643da5d2..ae00e83d291 100644
--- a/libredex/ReachableObjects.h
+++ b/libredex/ReachableObjects.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/RedexContext.cpp b/libredex/RedexContext.cpp
index a6d03ecf5be..36dccf20ca5 100644
--- a/libredex/RedexContext.cpp
+++ b/libredex/RedexContext.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RedexContext.h"
diff --git a/libredex/RedexContext.h b/libredex/RedexContext.h
index b3b0d7a7200..bad8ee7b23d 100644
--- a/libredex/RedexContext.h
+++ b/libredex/RedexContext.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/RedexResources.h b/libredex/RedexResources.h
index a55b0f4c3f9..ee0f138a865 100644
--- a/libredex/RedexResources.h
+++ b/libredex/RedexResources.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/ReferencedState.h b/libredex/ReferencedState.h
index 4707c8fd0f8..f8205370382 100644
--- a/libredex/ReferencedState.h
+++ b/libredex/ReferencedState.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/Resolver.cpp b/libredex/Resolver.cpp
index f4e66dbc7c4..29f131597a8 100644
--- a/libredex/Resolver.cpp
+++ b/libredex/Resolver.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Resolver.h"
diff --git a/libredex/Resolver.h b/libredex/Resolver.h
index bb7bd9ffcbd..445b9f07940 100644
--- a/libredex/Resolver.h
+++ b/libredex/Resolver.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/Show.cpp b/libredex/Show.cpp
index 371506c2184..c7fa823d378 100644
--- a/libredex/Show.cpp
+++ b/libredex/Show.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Show.h"
diff --git a/libredex/Show.h b/libredex/Show.h
index f79c8e148ff..f464a978efb 100644
--- a/libredex/Show.h
+++ b/libredex/Show.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/SimpleReflectionAnalysis.cpp b/libredex/SimpleReflectionAnalysis.cpp
index 4a8d1a51980..959ed406205 100644
--- a/libredex/SimpleReflectionAnalysis.cpp
+++ b/libredex/SimpleReflectionAnalysis.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "SimpleReflectionAnalysis.h"
diff --git a/libredex/SimpleReflectionAnalysis.h b/libredex/SimpleReflectionAnalysis.h
index 035948f71e3..85f3b173717 100644
--- a/libredex/SimpleReflectionAnalysis.h
+++ b/libredex/SimpleReflectionAnalysis.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/SimpleValueAbstractDomain.h b/libredex/SimpleValueAbstractDomain.h
index 3e67c944775..b6d0c95e7cd 100644
--- a/libredex/SimpleValueAbstractDomain.h
+++ b/libredex/SimpleValueAbstractDomain.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/StringBuilder.h b/libredex/StringBuilder.h
index e000aeb8ea2..382b99eb02f 100644
--- a/libredex/StringBuilder.h
+++ b/libredex/StringBuilder.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/Timer.cpp b/libredex/Timer.cpp
index 14a74fbc75e..d005b675395 100644
--- a/libredex/Timer.cpp
+++ b/libredex/Timer.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Timer.h"
diff --git a/libredex/Timer.h b/libredex/Timer.h
index cfe8c0ef3ea..3a70fd8efdd 100644
--- a/libredex/Timer.h
+++ b/libredex/Timer.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/Trace.cpp b/libredex/Trace.cpp
index f9d5b2f2d63..999919ea484 100644
--- a/libredex/Trace.cpp
+++ b/libredex/Trace.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Trace.h"
diff --git a/libredex/Trace.h b/libredex/Trace.h
index bb9c7caa06a..655a7a6903e 100644
--- a/libredex/Trace.h
+++ b/libredex/Trace.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/Transform.cpp b/libredex/Transform.cpp
index f1aab611a63..728345dd538 100644
--- a/libredex/Transform.cpp
+++ b/libredex/Transform.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Transform.h"
diff --git a/libredex/Transform.h b/libredex/Transform.h
index ebd70573685..67583d3d925 100644
--- a/libredex/Transform.h
+++ b/libredex/Transform.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/TypeSystem.cpp b/libredex/TypeSystem.cpp
index 223c921db5b..39cc534bcc1 100644
--- a/libredex/TypeSystem.cpp
+++ b/libredex/TypeSystem.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "TypeSystem.h"
diff --git a/libredex/TypeSystem.h b/libredex/TypeSystem.h
index d7eab6a4696..e2b6b3098b3 100644
--- a/libredex/TypeSystem.h
+++ b/libredex/TypeSystem.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/Vinfo.cpp b/libredex/Vinfo.cpp
index 75957a80859..38b1b7006b5 100644
--- a/libredex/Vinfo.cpp
+++ b/libredex/Vinfo.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Vinfo.h"
diff --git a/libredex/Vinfo.h b/libredex/Vinfo.h
index 6c684fe0606..dc4fe68590a 100644
--- a/libredex/Vinfo.h
+++ b/libredex/Vinfo.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/VirtualScope.cpp b/libredex/VirtualScope.cpp
index 42372e83237..bbe78253c8e 100644
--- a/libredex/VirtualScope.cpp
+++ b/libredex/VirtualScope.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "VirtualScope.h"
diff --git a/libredex/VirtualScope.h b/libredex/VirtualScope.h
index cae693a5f50..3aab93978de 100644
--- a/libredex/VirtualScope.h
+++ b/libredex/VirtualScope.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/Walkers.h b/libredex/Walkers.h
index dd9b753bfc6..b5316b9c3e0 100644
--- a/libredex/Walkers.h
+++ b/libredex/Walkers.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/Warning.cpp b/libredex/Warning.cpp
index e8df5f83046..a06ad6bdfeb 100644
--- a/libredex/Warning.cpp
+++ b/libredex/Warning.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Warning.h"
diff --git a/libredex/Warning.h b/libredex/Warning.h
index b93842bc439..a85cb82230d 100644
--- a/libredex/Warning.h
+++ b/libredex/Warning.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libredex/WorkQueue.h b/libredex/WorkQueue.h
index af93e67af26..0c4f4ddab19 100644
--- a/libredex/WorkQueue.h
+++ b/libredex/WorkQueue.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/libresource/CompatWindows.h b/libresource/CompatWindows.h
index 5844d23eba5..56c5988bbd4 100644
--- a/libresource/CompatWindows.h
+++ b/libresource/CompatWindows.h
@@ -1,10 +1,8 @@
 /**
-* Copyright (c) 2016-present, Facebook, Inc.
-* All rights reserved.
+* Copyright (c) Facebook, Inc. and its affiliates.
 *
-* This source code is licensed under the BSD-style license found in the
-* LICENSE file in the root directory of this source tree. An additional grant
-* of patent rights can be found in the PATENTS file in the same directory.
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
 */
 
 #pragma once
diff --git a/libresource/RedexResources.cpp b/libresource/RedexResources.cpp
index 1817c02bcbe..ac25ba1a05f 100644
--- a/libresource/RedexResources.cpp
+++ b/libresource/RedexResources.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <boost/algorithm/string.hpp>
diff --git a/libresource/Serialize.cpp b/libresource/Serialize.cpp
index eeeabda0fa4..640c1939ae6 100644
--- a/libresource/Serialize.cpp
+++ b/libresource/Serialize.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
  #include "utils/ByteOrder.h"
diff --git a/libresource/cutils/log.h b/libresource/cutils/log.h
index f8aeca6359a..9de7cc03c3a 100644
--- a/libresource/cutils/log.h
+++ b/libresource/cutils/log.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "utils/Log.h"
diff --git a/libresource/sync.py b/libresource/sync.py
index cb43ee4a86a..43458d485bf 100755
--- a/libresource/sync.py
+++ b/libresource/sync.py
@@ -1,9 +1,7 @@
-# Copyright (c) 2016-present, Facebook, Inc.
-# All rights reserved.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 # This script will copy all the resource parsing files from AOSP to redex
 # so that we can easily stay up-to-date if these files change in AOSP.
diff --git a/libresource/utils/Atomic.h b/libresource/utils/Atomic.h
index a4dcbc04849..72d107f1b48 100644
--- a/libresource/utils/Atomic.h
+++ b/libresource/utils/Atomic.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 
diff --git a/libresource/utils/Log.h b/libresource/utils/Log.h
index b74785cf61d..0c44043db67 100644
--- a/libresource/utils/Log.h
+++ b/libresource/utils/Log.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 
diff --git a/libresource/utils/Serialize.h b/libresource/utils/Serialize.h
index 3552309188b..6290a646968 100644
--- a/libresource/utils/Serialize.h
+++ b/libresource/utils/Serialize.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
  #ifndef _FB_ANDROID_SERIALIZE_H
diff --git a/opt/access-marking/AccessMarking.cpp b/opt/access-marking/AccessMarking.cpp
index 970f3201f80..8ba311a053d 100644
--- a/opt/access-marking/AccessMarking.cpp
+++ b/opt/access-marking/AccessMarking.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "AccessMarking.h"
diff --git a/opt/access-marking/AccessMarking.h b/opt/access-marking/AccessMarking.h
index 584a4dd0d77..73bf5c5a95b 100644
--- a/opt/access-marking/AccessMarking.h
+++ b/opt/access-marking/AccessMarking.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/add_redex_txt_to_apk/AddRedexTxtToApk.cpp b/opt/add_redex_txt_to_apk/AddRedexTxtToApk.cpp
index c8f32aaa24c..8a0a0ef09a6 100644
--- a/opt/add_redex_txt_to_apk/AddRedexTxtToApk.cpp
+++ b/opt/add_redex_txt_to_apk/AddRedexTxtToApk.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "AddRedexTxtToApk.h"
diff --git a/opt/add_redex_txt_to_apk/AddRedexTxtToApk.h b/opt/add_redex_txt_to_apk/AddRedexTxtToApk.h
index 0497948dd0b..10ec21f8a99 100644
--- a/opt/add_redex_txt_to_apk/AddRedexTxtToApk.h
+++ b/opt/add_redex_txt_to_apk/AddRedexTxtToApk.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/analysis_ref_graph/ReferenceGraphCreator.cpp b/opt/analysis_ref_graph/ReferenceGraphCreator.cpp
index 33ed074179d..c55a8b61553 100644
--- a/opt/analysis_ref_graph/ReferenceGraphCreator.cpp
+++ b/opt/analysis_ref_graph/ReferenceGraphCreator.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ReferenceGraphCreator.h"
diff --git a/opt/analysis_ref_graph/ReferenceGraphCreator.h b/opt/analysis_ref_graph/ReferenceGraphCreator.h
index 3884b7ba046..d58c9295e68 100644
--- a/opt/analysis_ref_graph/ReferenceGraphCreator.h
+++ b/opt/analysis_ref_graph/ReferenceGraphCreator.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/annokill/AnnoKill.cpp b/opt/annokill/AnnoKill.cpp
index ec9b81b4be9..a98f7d2c1ce 100644
--- a/opt/annokill/AnnoKill.cpp
+++ b/opt/annokill/AnnoKill.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "AnnoKill.h"
diff --git a/opt/annokill/AnnoKill.h b/opt/annokill/AnnoKill.h
index 7e65a6ab724..a857118b027 100644
--- a/opt/annokill/AnnoKill.h
+++ b/opt/annokill/AnnoKill.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/bridge/Bridge.cpp b/opt/bridge/Bridge.cpp
index b592aebeb6d..e4bc32129e0 100644
--- a/opt/bridge/Bridge.cpp
+++ b/opt/bridge/Bridge.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Bridge.h"
diff --git a/opt/bridge/Bridge.h b/opt/bridge/Bridge.h
index 3ec23f7d165..f95e4f96084 100644
--- a/opt/bridge/Bridge.h
+++ b/opt/bridge/Bridge.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/check_breadcrumbs/CheckBreadcrumbs.cpp b/opt/check_breadcrumbs/CheckBreadcrumbs.cpp
index 46169810974..b1fe11abecd 100644
--- a/opt/check_breadcrumbs/CheckBreadcrumbs.cpp
+++ b/opt/check_breadcrumbs/CheckBreadcrumbs.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "CheckBreadcrumbs.h"
diff --git a/opt/check_breadcrumbs/CheckBreadcrumbs.h b/opt/check_breadcrumbs/CheckBreadcrumbs.h
index d2c94fe6bbe..04e39babfce 100644
--- a/opt/check_breadcrumbs/CheckBreadcrumbs.h
+++ b/opt/check_breadcrumbs/CheckBreadcrumbs.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/constant-propagation/ConstantPropagation.cpp b/opt/constant-propagation/ConstantPropagation.cpp
index 243f1b45c3e..b021d2ca11f 100644
--- a/opt/constant-propagation/ConstantPropagation.cpp
+++ b/opt/constant-propagation/ConstantPropagation.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ConstantPropagation.h"
diff --git a/opt/constant-propagation/ConstantPropagation.h b/opt/constant-propagation/ConstantPropagation.h
index 70422e93673..fc846df3795 100644
--- a/opt/constant-propagation/ConstantPropagation.h
+++ b/opt/constant-propagation/ConstantPropagation.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/constant-propagation/ConstantPropagationRuntimeAssert.cpp b/opt/constant-propagation/ConstantPropagationRuntimeAssert.cpp
index 6032e501a53..16fd3410aaa 100644
--- a/opt/constant-propagation/ConstantPropagationRuntimeAssert.cpp
+++ b/opt/constant-propagation/ConstantPropagationRuntimeAssert.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ConstantPropagationRuntimeAssert.h"
diff --git a/opt/constant-propagation/ConstantPropagationRuntimeAssert.h b/opt/constant-propagation/ConstantPropagationRuntimeAssert.h
index 1d95ca49140..2ed57eb8407 100644
--- a/opt/constant-propagation/ConstantPropagationRuntimeAssert.h
+++ b/opt/constant-propagation/ConstantPropagationRuntimeAssert.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/constant-propagation/ConstantPropagationTransform.cpp b/opt/constant-propagation/ConstantPropagationTransform.cpp
index b1bae5fe368..3834aa4bce8 100644
--- a/opt/constant-propagation/ConstantPropagationTransform.cpp
+++ b/opt/constant-propagation/ConstantPropagationTransform.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ConstantPropagationTransform.h"
diff --git a/opt/constant-propagation/ConstantPropagationTransform.h b/opt/constant-propagation/ConstantPropagationTransform.h
index 81cafdbde11..ab2b322bd21 100644
--- a/opt/constant-propagation/ConstantPropagationTransform.h
+++ b/opt/constant-propagation/ConstantPropagationTransform.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/constant-propagation/IPConstantPropagation.cpp b/opt/constant-propagation/IPConstantPropagation.cpp
index b148b970d96..33331da40d9 100644
--- a/opt/constant-propagation/IPConstantPropagation.cpp
+++ b/opt/constant-propagation/IPConstantPropagation.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "IPConstantPropagation.h"
diff --git a/opt/constant-propagation/IPConstantPropagation.h b/opt/constant-propagation/IPConstantPropagation.h
index d913d7093cb..a63139a55f4 100644
--- a/opt/constant-propagation/IPConstantPropagation.h
+++ b/opt/constant-propagation/IPConstantPropagation.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/copy-propagation/AliasedRegisters.cpp b/opt/copy-propagation/AliasedRegisters.cpp
index 0d118ee4032..777a7e6eeca 100644
--- a/opt/copy-propagation/AliasedRegisters.cpp
+++ b/opt/copy-propagation/AliasedRegisters.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "AliasedRegisters.h"
diff --git a/opt/copy-propagation/AliasedRegisters.h b/opt/copy-propagation/AliasedRegisters.h
index 59ad24186ae..8132cc3d59a 100644
--- a/opt/copy-propagation/AliasedRegisters.h
+++ b/opt/copy-propagation/AliasedRegisters.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/copy-propagation/CopyPropagationPass.cpp b/opt/copy-propagation/CopyPropagationPass.cpp
index dd569200072..b433c4d533f 100644
--- a/opt/copy-propagation/CopyPropagationPass.cpp
+++ b/opt/copy-propagation/CopyPropagationPass.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "CopyPropagationPass.h"
diff --git a/opt/copy-propagation/CopyPropagationPass.h b/opt/copy-propagation/CopyPropagationPass.h
index 251f361a15c..fd58fd68ef8 100644
--- a/opt/copy-propagation/CopyPropagationPass.h
+++ b/opt/copy-propagation/CopyPropagationPass.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/dead-code-elimination/DeadCodeEliminationPass.cpp b/opt/dead-code-elimination/DeadCodeEliminationPass.cpp
index b9cd964a221..14662de9ba1 100644
--- a/opt/dead-code-elimination/DeadCodeEliminationPass.cpp
+++ b/opt/dead-code-elimination/DeadCodeEliminationPass.cpp
@@ -1,11 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional
- * grant of patent rights can be found in the PATENTS file in the same
- * directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "DeadCodeEliminationPass.h"
diff --git a/opt/dead-code-elimination/DeadCodeEliminationPass.h b/opt/dead-code-elimination/DeadCodeEliminationPass.h
index 9a12a619d9c..28ebc4d5b77 100644
--- a/opt/dead-code-elimination/DeadCodeEliminationPass.h
+++ b/opt/dead-code-elimination/DeadCodeEliminationPass.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/dead-code-elimination/SideEffectSummary.cpp b/opt/dead-code-elimination/SideEffectSummary.cpp
index d909f5a95e0..adcf7a5d39e 100644
--- a/opt/dead-code-elimination/SideEffectSummary.cpp
+++ b/opt/dead-code-elimination/SideEffectSummary.cpp
@@ -1,11 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional
- * grant of patent rights can be found in the PATENTS file in the same
- * directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "SideEffectSummary.h"
diff --git a/opt/dead-code-elimination/SideEffectSummary.h b/opt/dead-code-elimination/SideEffectSummary.h
index 1f7ca09311b..29b82ee0731 100644
--- a/opt/dead-code-elimination/SideEffectSummary.h
+++ b/opt/dead-code-elimination/SideEffectSummary.h
@@ -1,11 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional
- * grant of patent rights can be found in the PATENTS file in the same
- * directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/dead-code-elimination/UsedVarsAnalysis.cpp b/opt/dead-code-elimination/UsedVarsAnalysis.cpp
index 4b3890d4d70..63098966b87 100644
--- a/opt/dead-code-elimination/UsedVarsAnalysis.cpp
+++ b/opt/dead-code-elimination/UsedVarsAnalysis.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "UsedVarsAnalysis.h"
diff --git a/opt/dead-code-elimination/UsedVarsAnalysis.h b/opt/dead-code-elimination/UsedVarsAnalysis.h
index 9f00b3a6e46..f46f95b0dc1 100644
--- a/opt/dead-code-elimination/UsedVarsAnalysis.h
+++ b/opt/dead-code-elimination/UsedVarsAnalysis.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/dedup_blocks/DedupBlocksPass.cpp b/opt/dedup_blocks/DedupBlocksPass.cpp
index 34d7dcff802..22cc93e2c70 100644
--- a/opt/dedup_blocks/DedupBlocksPass.cpp
+++ b/opt/dedup_blocks/DedupBlocksPass.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "DedupBlocksPass.h"
diff --git a/opt/dedup_blocks/DedupBlocksPass.h b/opt/dedup_blocks/DedupBlocksPass.h
index ad9ebad81bf..e38470d0629 100644
--- a/opt/dedup_blocks/DedupBlocksPass.h
+++ b/opt/dedup_blocks/DedupBlocksPass.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/delinit/DelInit.cpp b/opt/delinit/DelInit.cpp
index a3abf7bf12c..29b77424cb1 100644
--- a/opt/delinit/DelInit.cpp
+++ b/opt/delinit/DelInit.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "DelInit.h"
diff --git a/opt/delinit/DelInit.h b/opt/delinit/DelInit.h
index 95d467e9893..b682c53b30e 100644
--- a/opt/delinit/DelInit.h
+++ b/opt/delinit/DelInit.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/delsuper/DelSuper.cpp b/opt/delsuper/DelSuper.cpp
index 66a27fb3199..724ac99b405 100644
--- a/opt/delsuper/DelSuper.cpp
+++ b/opt/delsuper/DelSuper.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "DelSuper.h"
diff --git a/opt/delsuper/DelSuper.h b/opt/delsuper/DelSuper.h
index eeb46512434..54a6d34f187 100644
--- a/opt/delsuper/DelSuper.h
+++ b/opt/delsuper/DelSuper.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/final_inline/FinalInline.cpp b/opt/final_inline/FinalInline.cpp
index aed4723c621..a0efdd05a15 100644
--- a/opt/final_inline/FinalInline.cpp
+++ b/opt/final_inline/FinalInline.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "FinalInline.h"
diff --git a/opt/final_inline/FinalInline.h b/opt/final_inline/FinalInline.h
index 94c7dca4a51..79d74f5196d 100644
--- a/opt/final_inline/FinalInline.h
+++ b/opt/final_inline/FinalInline.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/hotness-score/HotnessScore.cpp b/opt/hotness-score/HotnessScore.cpp
index 9aaa1899bc7..93d6bd4d0a3 100644
--- a/opt/hotness-score/HotnessScore.cpp
+++ b/opt/hotness-score/HotnessScore.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "HotnessScore.h"
diff --git a/opt/hotness-score/HotnessScore.h b/opt/hotness-score/HotnessScore.h
index eae8a083ab5..46cc9a692f4 100644
--- a/opt/hotness-score/HotnessScore.h
+++ b/opt/hotness-score/HotnessScore.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/inlineinit/InlineInit.cpp b/opt/inlineinit/InlineInit.cpp
index c46f6438b40..5e5a7046e7c 100644
--- a/opt/inlineinit/InlineInit.cpp
+++ b/opt/inlineinit/InlineInit.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Deleter.h"
diff --git a/opt/inlineinit/InlineInit.h b/opt/inlineinit/InlineInit.h
index 42f62f68299..0c2dc1dbfee 100644
--- a/opt/inlineinit/InlineInit.h
+++ b/opt/inlineinit/InlineInit.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/instrument/Instrument.cpp b/opt/instrument/Instrument.cpp
index 4f343d038d5..bd310406305 100644
--- a/opt/instrument/Instrument.cpp
+++ b/opt/instrument/Instrument.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Instrument.h"
diff --git a/opt/instrument/Instrument.h b/opt/instrument/Instrument.h
index 0251f0bf658..2bc5e8e03c3 100644
--- a/opt/instrument/Instrument.h
+++ b/opt/instrument/Instrument.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/interdex/InterDex.cpp b/opt/interdex/InterDex.cpp
index 01ab80a22f3..51e082b4eca 100644
--- a/opt/interdex/InterDex.cpp
+++ b/opt/interdex/InterDex.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "InterDex.h"
diff --git a/opt/interdex/InterDex.h b/opt/interdex/InterDex.h
index 6934401970b..8023c94cdb0 100644
--- a/opt/interdex/InterDex.h
+++ b/opt/interdex/InterDex.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/local-dce/LocalDce.cpp b/opt/local-dce/LocalDce.cpp
index 38c5c171d66..ea55a69027b 100644
--- a/opt/local-dce/LocalDce.cpp
+++ b/opt/local-dce/LocalDce.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "LocalDce.h"
diff --git a/opt/local-dce/LocalDce.h b/opt/local-dce/LocalDce.h
index ed35e13ee81..2acbfa4af7f 100644
--- a/opt/local-dce/LocalDce.h
+++ b/opt/local-dce/LocalDce.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/obfuscate/Obfuscate.cpp b/opt/obfuscate/Obfuscate.cpp
index e28c7fd6b32..ac41a013d30 100644
--- a/opt/obfuscate/Obfuscate.cpp
+++ b/opt/obfuscate/Obfuscate.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <list>
diff --git a/opt/obfuscate/Obfuscate.h b/opt/obfuscate/Obfuscate.h
index 5a67accd46d..08ab929ad3c 100644
--- a/opt/obfuscate/Obfuscate.h
+++ b/opt/obfuscate/Obfuscate.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/obfuscate/ObfuscateUtils.cpp b/opt/obfuscate/ObfuscateUtils.cpp
index 02fc8cc2254..61294579fd1 100644
--- a/opt/obfuscate/ObfuscateUtils.cpp
+++ b/opt/obfuscate/ObfuscateUtils.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ObfuscateUtils.h"
diff --git a/opt/obfuscate/ObfuscateUtils.h b/opt/obfuscate/ObfuscateUtils.h
index 22d3e8e3a30..ecfed959023 100644
--- a/opt/obfuscate/ObfuscateUtils.h
+++ b/opt/obfuscate/ObfuscateUtils.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/obfuscate/VirtualRenamer.cpp b/opt/obfuscate/VirtualRenamer.cpp
index 7001a6ade67..50b23318734 100644
--- a/opt/obfuscate/VirtualRenamer.cpp
+++ b/opt/obfuscate/VirtualRenamer.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "VirtualRenamer.h"
diff --git a/opt/obfuscate/VirtualRenamer.h b/opt/obfuscate/VirtualRenamer.h
index 5980d86c512..9628c7932aa 100644
--- a/opt/obfuscate/VirtualRenamer.h
+++ b/opt/obfuscate/VirtualRenamer.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/original_name/OriginalNamePass.cpp b/opt/original_name/OriginalNamePass.cpp
index d5d4288205f..471a3e806f9 100644
--- a/opt/original_name/OriginalNamePass.cpp
+++ b/opt/original_name/OriginalNamePass.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "DexUtil.h"
diff --git a/opt/original_name/OriginalNamePass.h b/opt/original_name/OriginalNamePass.h
index 0073e0b4e35..0cdf50d197f 100644
--- a/opt/original_name/OriginalNamePass.h
+++ b/opt/original_name/OriginalNamePass.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/outliner/Outliner.cpp b/opt/outliner/Outliner.cpp
index e22e244e86a..9bfce40b0d9 100644
--- a/opt/outliner/Outliner.cpp
+++ b/opt/outliner/Outliner.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Outliner.h"
diff --git a/opt/outliner/Outliner.h b/opt/outliner/Outliner.h
index 15de70e92a5..ba0cb074830 100644
--- a/opt/outliner/Outliner.h
+++ b/opt/outliner/Outliner.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/peephole/Peephole.cpp b/opt/peephole/Peephole.cpp
index a6beeea6b74..fdafb004b72 100644
--- a/opt/peephole/Peephole.cpp
+++ b/opt/peephole/Peephole.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Peephole.h"
diff --git a/opt/peephole/Peephole.h b/opt/peephole/Peephole.h
index 1a54947635a..ebbf23642b3 100644
--- a/opt/peephole/Peephole.h
+++ b/opt/peephole/Peephole.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/peephole/RedundantCheckCastRemover.cpp b/opt/peephole/RedundantCheckCastRemover.cpp
index f5cd18802a7..9cc9a795abc 100644
--- a/opt/peephole/RedundantCheckCastRemover.cpp
+++ b/opt/peephole/RedundantCheckCastRemover.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RedundantCheckCastRemover.h"
diff --git a/opt/peephole/RedundantCheckCastRemover.h b/opt/peephole/RedundantCheckCastRemover.h
index 3ffa334c850..2a8ea1bde06 100644
--- a/opt/peephole/RedundantCheckCastRemover.h
+++ b/opt/peephole/RedundantCheckCastRemover.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/print-members/PrintMembers.cpp b/opt/print-members/PrintMembers.cpp
index 83c35d9cafe..3038e7c44ad 100644
--- a/opt/print-members/PrintMembers.cpp
+++ b/opt/print-members/PrintMembers.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "PrintMembers.h"
diff --git a/opt/print-members/PrintMembers.h b/opt/print-members/PrintMembers.h
index 7003371e544..a089b9bf798 100644
--- a/opt/print-members/PrintMembers.h
+++ b/opt/print-members/PrintMembers.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/reachability_graph/ReachabilityGraphPrinter.cpp b/opt/reachability_graph/ReachabilityGraphPrinter.cpp
index 1aa815cf3e1..85c71b6f90b 100644
--- a/opt/reachability_graph/ReachabilityGraphPrinter.cpp
+++ b/opt/reachability_graph/ReachabilityGraphPrinter.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ReachabilityGraphPrinter.h"
diff --git a/opt/reachability_graph/ReachabilityGraphPrinter.h b/opt/reachability_graph/ReachabilityGraphPrinter.h
index 6c6075033d0..7ef4ffd4f73 100644
--- a/opt/reachability_graph/ReachabilityGraphPrinter.h
+++ b/opt/reachability_graph/ReachabilityGraphPrinter.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/rebindrefs/ReBindRefs.cpp b/opt/rebindrefs/ReBindRefs.cpp
index fbdf42d3b9b..1461cb765f4 100644
--- a/opt/rebindrefs/ReBindRefs.cpp
+++ b/opt/rebindrefs/ReBindRefs.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ReBindRefs.h"
diff --git a/opt/rebindrefs/ReBindRefs.h b/opt/rebindrefs/ReBindRefs.h
index e89beacd9d3..69a11b964a0 100644
--- a/opt/rebindrefs/ReBindRefs.h
+++ b/opt/rebindrefs/ReBindRefs.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/regalloc/GraphColoring.cpp b/opt/regalloc/GraphColoring.cpp
index a8e7b1150ac..fedf9ea5685 100644
--- a/opt/regalloc/GraphColoring.cpp
+++ b/opt/regalloc/GraphColoring.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "GraphColoring.h"
diff --git a/opt/regalloc/GraphColoring.h b/opt/regalloc/GraphColoring.h
index 11430edc698..695ca4236a6 100644
--- a/opt/regalloc/GraphColoring.h
+++ b/opt/regalloc/GraphColoring.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/regalloc/Interference.cpp b/opt/regalloc/Interference.cpp
index 5e30888adee..4bebc8abafa 100644
--- a/opt/regalloc/Interference.cpp
+++ b/opt/regalloc/Interference.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Interference.h"
diff --git a/opt/regalloc/Interference.h b/opt/regalloc/Interference.h
index c5a951d59c1..37edacf44c1 100644
--- a/opt/regalloc/Interference.h
+++ b/opt/regalloc/Interference.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/regalloc/RegAlloc.cpp b/opt/regalloc/RegAlloc.cpp
index 6804e028507..2f0b9643049 100644
--- a/opt/regalloc/RegAlloc.cpp
+++ b/opt/regalloc/RegAlloc.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RegAlloc.h"
diff --git a/opt/regalloc/RegAlloc.h b/opt/regalloc/RegAlloc.h
index 48467f90e09..ec06af91ed4 100644
--- a/opt/regalloc/RegAlloc.h
+++ b/opt/regalloc/RegAlloc.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/regalloc/RegisterType.cpp b/opt/regalloc/RegisterType.cpp
index ef3bf440d73..2f64fb79da3 100644
--- a/opt/regalloc/RegisterType.cpp
+++ b/opt/regalloc/RegisterType.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RegisterType.h"
diff --git a/opt/regalloc/RegisterType.h b/opt/regalloc/RegisterType.h
index 99f7d13c170..cddbd2c5cf7 100644
--- a/opt/regalloc/RegisterType.h
+++ b/opt/regalloc/RegisterType.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/regalloc/Split.cpp b/opt/regalloc/Split.cpp
index c2d6087bd6a..f9d4aa6fc08 100644
--- a/opt/regalloc/Split.cpp
+++ b/opt/regalloc/Split.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Split.h"
diff --git a/opt/regalloc/Split.h b/opt/regalloc/Split.h
index 70ef7c6574a..86fa2ed0534 100644
--- a/opt/regalloc/Split.h
+++ b/opt/regalloc/Split.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/regalloc/VirtualRegistersFile.cpp b/opt/regalloc/VirtualRegistersFile.cpp
index a7379bbe895..a2ce66414d5 100644
--- a/opt/regalloc/VirtualRegistersFile.cpp
+++ b/opt/regalloc/VirtualRegistersFile.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "VirtualRegistersFile.h"
diff --git a/opt/regalloc/VirtualRegistersFile.h b/opt/regalloc/VirtualRegistersFile.h
index 7d7143c9b1d..b37204afdc4 100644
--- a/opt/regalloc/VirtualRegistersFile.h
+++ b/opt/regalloc/VirtualRegistersFile.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <boost/dynamic_bitset.hpp>
diff --git a/opt/remove-builders/RemoveBuilders.cpp b/opt/remove-builders/RemoveBuilders.cpp
index 3f6c498fd0c..1c60020f18d 100644
--- a/opt/remove-builders/RemoveBuilders.cpp
+++ b/opt/remove-builders/RemoveBuilders.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RemoveBuilders.h"
diff --git a/opt/remove-builders/RemoveBuilders.h b/opt/remove-builders/RemoveBuilders.h
index 5fbfdd6ccd9..b4202801619 100644
--- a/opt/remove-builders/RemoveBuilders.h
+++ b/opt/remove-builders/RemoveBuilders.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/remove-builders/RemoveBuildersHelper.cpp b/opt/remove-builders/RemoveBuildersHelper.cpp
index d95bd573aa8..4c9edab18ea 100644
--- a/opt/remove-builders/RemoveBuildersHelper.cpp
+++ b/opt/remove-builders/RemoveBuildersHelper.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RemoveBuildersHelper.h"
diff --git a/opt/remove-builders/RemoveBuildersHelper.h b/opt/remove-builders/RemoveBuildersHelper.h
index 6b51af125e7..9311da92336 100644
--- a/opt/remove-builders/RemoveBuildersHelper.h
+++ b/opt/remove-builders/RemoveBuildersHelper.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/remove-unreachable/RemoveUnreachable.cpp b/opt/remove-unreachable/RemoveUnreachable.cpp
index 347c64a545f..4a3373ce1c8 100644
--- a/opt/remove-unreachable/RemoveUnreachable.cpp
+++ b/opt/remove-unreachable/RemoveUnreachable.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RemoveUnreachable.h"
diff --git a/opt/remove-unreachable/RemoveUnreachable.h b/opt/remove-unreachable/RemoveUnreachable.h
index d32d164c1b4..ebd0e17df72 100644
--- a/opt/remove-unreachable/RemoveUnreachable.h
+++ b/opt/remove-unreachable/RemoveUnreachable.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/remove-unread-fields/RemoveUnreadFields.cpp b/opt/remove-unread-fields/RemoveUnreadFields.cpp
index 99d22774e90..b3307a761d3 100644
--- a/opt/remove-unread-fields/RemoveUnreadFields.cpp
+++ b/opt/remove-unread-fields/RemoveUnreadFields.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RemoveUnreadFields.h"
diff --git a/opt/remove-unread-fields/RemoveUnreadFields.h b/opt/remove-unread-fields/RemoveUnreadFields.h
index 2a36bbd827a..e1903db47a3 100644
--- a/opt/remove-unread-fields/RemoveUnreadFields.h
+++ b/opt/remove-unread-fields/RemoveUnreadFields.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/remove_empty_classes/RemoveEmptyClasses.cpp b/opt/remove_empty_classes/RemoveEmptyClasses.cpp
index 6246f97c07d..c1c327327f2 100644
--- a/opt/remove_empty_classes/RemoveEmptyClasses.cpp
+++ b/opt/remove_empty_classes/RemoveEmptyClasses.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <stdio.h>
diff --git a/opt/remove_empty_classes/RemoveEmptyClasses.h b/opt/remove_empty_classes/RemoveEmptyClasses.h
index 3e7114edd42..135b5ad3f45 100644
--- a/opt/remove_empty_classes/RemoveEmptyClasses.h
+++ b/opt/remove_empty_classes/RemoveEmptyClasses.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/remove_gotos/RemoveGotos.cpp b/opt/remove_gotos/RemoveGotos.cpp
index 320b4fba89c..2dee7d8a0ab 100644
--- a/opt/remove_gotos/RemoveGotos.cpp
+++ b/opt/remove_gotos/RemoveGotos.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /*
diff --git a/opt/remove_gotos/RemoveGotos.h b/opt/remove_gotos/RemoveGotos.h
index 7eb88e36b4c..d85df583526 100644
--- a/opt/remove_gotos/RemoveGotos.h
+++ b/opt/remove_gotos/RemoveGotos.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/renameclasses/RenameClasses.cpp b/opt/renameclasses/RenameClasses.cpp
index 084194813cb..ecdb428e543 100644
--- a/opt/renameclasses/RenameClasses.cpp
+++ b/opt/renameclasses/RenameClasses.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RenameClasses.h"
diff --git a/opt/renameclasses/RenameClasses.h b/opt/renameclasses/RenameClasses.h
index 6d0fbbc662e..8563bd9ce3b 100644
--- a/opt/renameclasses/RenameClasses.h
+++ b/opt/renameclasses/RenameClasses.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/renameclasses/RenameClassesV2.cpp b/opt/renameclasses/RenameClassesV2.cpp
index 13029f38ac8..94245a085fd 100644
--- a/opt/renameclasses/RenameClassesV2.cpp
+++ b/opt/renameclasses/RenameClassesV2.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RenameClassesV2.h"
diff --git a/opt/renameclasses/RenameClassesV2.h b/opt/renameclasses/RenameClassesV2.h
index 7e929b6ecff..6955585399a 100644
--- a/opt/renameclasses/RenameClassesV2.h
+++ b/opt/renameclasses/RenameClassesV2.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/reorder-interfaces/ReorderInterfaces.cpp b/opt/reorder-interfaces/ReorderInterfaces.cpp
index 2d67ec13759..1cfd738bc47 100644
--- a/opt/reorder-interfaces/ReorderInterfaces.cpp
+++ b/opt/reorder-interfaces/ReorderInterfaces.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ReorderInterfaces.h"
diff --git a/opt/reorder-interfaces/ReorderInterfaces.h b/opt/reorder-interfaces/ReorderInterfaces.h
index a1d2955f32e..c73fcc33836 100644
--- a/opt/reorder-interfaces/ReorderInterfaces.h
+++ b/opt/reorder-interfaces/ReorderInterfaces.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/shorten-srcstrings/Shorten.cpp b/opt/shorten-srcstrings/Shorten.cpp
index d555a6e460f..4defde9b57f 100644
--- a/opt/shorten-srcstrings/Shorten.cpp
+++ b/opt/shorten-srcstrings/Shorten.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Shorten.h"
diff --git a/opt/shorten-srcstrings/Shorten.h b/opt/shorten-srcstrings/Shorten.h
index 1d519f9b62c..58afadbef4a 100644
--- a/opt/shorten-srcstrings/Shorten.h
+++ b/opt/shorten-srcstrings/Shorten.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/simpleinline/Deleter.cpp b/opt/simpleinline/Deleter.cpp
index a0949662fce..4d963e9784c 100644
--- a/opt/simpleinline/Deleter.cpp
+++ b/opt/simpleinline/Deleter.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Deleter.h"
diff --git a/opt/simpleinline/Deleter.h b/opt/simpleinline/Deleter.h
index efcab113ad3..12813e9ad43 100644
--- a/opt/simpleinline/Deleter.h
+++ b/opt/simpleinline/Deleter.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/simpleinline/SimpleInline.cpp b/opt/simpleinline/SimpleInline.cpp
index 1c335610533..78f9d504165 100644
--- a/opt/simpleinline/SimpleInline.cpp
+++ b/opt/simpleinline/SimpleInline.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <algorithm>
diff --git a/opt/simpleinline/SimpleInline.h b/opt/simpleinline/SimpleInline.h
index 8c785d27438..70c907e95ef 100644
--- a/opt/simpleinline/SimpleInline.h
+++ b/opt/simpleinline/SimpleInline.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/singleimpl/SingleImpl.cpp b/opt/singleimpl/SingleImpl.cpp
index 5a9314a4906..a3381efda86 100644
--- a/opt/singleimpl/SingleImpl.cpp
+++ b/opt/singleimpl/SingleImpl.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "SingleImpl.h"
diff --git a/opt/singleimpl/SingleImpl.h b/opt/singleimpl/SingleImpl.h
index 9c035b138fc..dd3ceb8ee48 100644
--- a/opt/singleimpl/SingleImpl.h
+++ b/opt/singleimpl/SingleImpl.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/singleimpl/SingleImplAnalyze.cpp b/opt/singleimpl/SingleImplAnalyze.cpp
index d7e935faad4..e8966cc0062 100644
--- a/opt/singleimpl/SingleImplAnalyze.cpp
+++ b/opt/singleimpl/SingleImplAnalyze.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <stdio.h>
diff --git a/opt/singleimpl/SingleImplDefs.h b/opt/singleimpl/SingleImplDefs.h
index 507465aa025..10e29fedbae 100644
--- a/opt/singleimpl/SingleImplDefs.h
+++ b/opt/singleimpl/SingleImplDefs.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/singleimpl/SingleImplOptimize.cpp b/opt/singleimpl/SingleImplOptimize.cpp
index d8f76909bde..c6db0e608d7 100644
--- a/opt/singleimpl/SingleImplOptimize.cpp
+++ b/opt/singleimpl/SingleImplOptimize.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <stdio.h>
diff --git a/opt/singleimpl/SingleImplStats.cpp b/opt/singleimpl/SingleImplStats.cpp
index 3b6941094b1..9cc1d892b6a 100644
--- a/opt/singleimpl/SingleImplStats.cpp
+++ b/opt/singleimpl/SingleImplStats.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <stdio.h>
diff --git a/opt/singleimpl/SingleImplUtil.cpp b/opt/singleimpl/SingleImplUtil.cpp
index b34c479a9c1..e8efd066881 100644
--- a/opt/singleimpl/SingleImplUtil.cpp
+++ b/opt/singleimpl/SingleImplUtil.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "SingleImplUtil.h"
diff --git a/opt/singleimpl/SingleImplUtil.h b/opt/singleimpl/SingleImplUtil.h
index 6be0a7074be..0c534044c8a 100644
--- a/opt/singleimpl/SingleImplUtil.h
+++ b/opt/singleimpl/SingleImplUtil.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/static-sink/StaticSink.cpp b/opt/static-sink/StaticSink.cpp
index 6e3c89a7b06..1874a43ae77 100644
--- a/opt/static-sink/StaticSink.cpp
+++ b/opt/static-sink/StaticSink.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "StaticSink.h"
diff --git a/opt/static-sink/StaticSink.h b/opt/static-sink/StaticSink.h
index 0b395157f88..e4310f138fc 100644
--- a/opt/static-sink/StaticSink.h
+++ b/opt/static-sink/StaticSink.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/staticrelo/StaticRelo.cpp b/opt/staticrelo/StaticRelo.cpp
index daa6fbd9a54..778071b04ae 100644
--- a/opt/staticrelo/StaticRelo.cpp
+++ b/opt/staticrelo/StaticRelo.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "StaticRelo.h"
diff --git a/opt/staticrelo/StaticRelo.h b/opt/staticrelo/StaticRelo.h
index a9293a31ec8..62751fa00fa 100644
--- a/opt/staticrelo/StaticRelo.h
+++ b/opt/staticrelo/StaticRelo.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/string_simplification/StringDomain.h b/opt/string_simplification/StringDomain.h
index 6bca0f146fb..4e275870339 100644
--- a/opt/string_simplification/StringDomain.h
+++ b/opt/string_simplification/StringDomain.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/string_simplification/StringIterator.cpp b/opt/string_simplification/StringIterator.cpp
index 62af924ad4b..2c9d31a34f5 100644
--- a/opt/string_simplification/StringIterator.cpp
+++ b/opt/string_simplification/StringIterator.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "DexAsm.h"
diff --git a/opt/string_simplification/StringIterator.h b/opt/string_simplification/StringIterator.h
index 65fc5800a7d..9f1defe7868 100644
--- a/opt/string_simplification/StringIterator.h
+++ b/opt/string_simplification/StringIterator.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/string_simplification/StringSimplification.cpp b/opt/string_simplification/StringSimplification.cpp
index a739347550b..c4932517008 100644
--- a/opt/string_simplification/StringSimplification.cpp
+++ b/opt/string_simplification/StringSimplification.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "StringSimplification.h"
diff --git a/opt/string_simplification/StringSimplification.h b/opt/string_simplification/StringSimplification.h
index dddac4fbbeb..56764f42686 100644
--- a/opt/string_simplification/StringSimplification.h
+++ b/opt/string_simplification/StringSimplification.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/strip-debug-info/StripDebugInfo.cpp b/opt/strip-debug-info/StripDebugInfo.cpp
index 8025d81b7e5..8a2791f1f05 100644
--- a/opt/strip-debug-info/StripDebugInfo.cpp
+++ b/opt/strip-debug-info/StripDebugInfo.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "StripDebugInfo.h"
diff --git a/opt/strip-debug-info/StripDebugInfo.h b/opt/strip-debug-info/StripDebugInfo.h
index 96cb947f393..7682769a696 100644
--- a/opt/strip-debug-info/StripDebugInfo.h
+++ b/opt/strip-debug-info/StripDebugInfo.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/synth/Synth.cpp b/opt/synth/Synth.cpp
index f3ae6d535a7..6127ef4f1f5 100644
--- a/opt/synth/Synth.cpp
+++ b/opt/synth/Synth.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Synth.h"
diff --git a/opt/synth/Synth.h b/opt/synth/Synth.h
index 611c480cf64..5878df0b994 100644
--- a/opt/synth/Synth.h
+++ b/opt/synth/Synth.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/synth/SynthConfig.h b/opt/synth/SynthConfig.h
index e9a32e3c4b5..dc7d5466fe2 100644
--- a/opt/synth/SynthConfig.h
+++ b/opt/synth/SynthConfig.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/test_cfg/TestCFG.cpp b/opt/test_cfg/TestCFG.cpp
index 3a837996b71..b95af4b2759 100644
--- a/opt/test_cfg/TestCFG.cpp
+++ b/opt/test_cfg/TestCFG.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "TestCFG.h"
diff --git a/opt/test_cfg/TestCFG.h b/opt/test_cfg/TestCFG.h
index 0c4664c87fa..57d2b34ee7b 100644
--- a/opt/test_cfg/TestCFG.h
+++ b/opt/test_cfg/TestCFG.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/track_resources/TrackResources.cpp b/opt/track_resources/TrackResources.cpp
index d0336231a53..2589f3de004 100644
--- a/opt/track_resources/TrackResources.cpp
+++ b/opt/track_resources/TrackResources.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "TrackResources.h"
diff --git a/opt/track_resources/TrackResources.h b/opt/track_resources/TrackResources.h
index 66ac47168ad..f0007807a7e 100644
--- a/opt/track_resources/TrackResources.h
+++ b/opt/track_resources/TrackResources.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/unreferenced_interfaces/UnreferencedInterfaces.cpp b/opt/unreferenced_interfaces/UnreferencedInterfaces.cpp
index ed2c77f0e78..08912193826 100644
--- a/opt/unreferenced_interfaces/UnreferencedInterfaces.cpp
+++ b/opt/unreferenced_interfaces/UnreferencedInterfaces.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "UnreferencedInterfaces.h"
diff --git a/opt/unreferenced_interfaces/UnreferencedInterfaces.h b/opt/unreferenced_interfaces/UnreferencedInterfaces.h
index 99763fa4c6b..6fcf1f5cb02 100644
--- a/opt/unreferenced_interfaces/UnreferencedInterfaces.h
+++ b/opt/unreferenced_interfaces/UnreferencedInterfaces.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/unterface/Unterface.cpp b/opt/unterface/Unterface.cpp
index 82e92802c44..d4ac96462ee 100644
--- a/opt/unterface/Unterface.cpp
+++ b/opt/unterface/Unterface.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Unterface.h"
diff --git a/opt/unterface/Unterface.h b/opt/unterface/Unterface.h
index 2888252034b..452100cab5d 100644
--- a/opt/unterface/Unterface.h
+++ b/opt/unterface/Unterface.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/unterface/UnterfaceOpt.cpp b/opt/unterface/UnterfaceOpt.cpp
index b6309059cb7..34dc284a7a7 100644
--- a/opt/unterface/UnterfaceOpt.cpp
+++ b/opt/unterface/UnterfaceOpt.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "UnterfaceOpt.h"
diff --git a/opt/unterface/UnterfaceOpt.h b/opt/unterface/UnterfaceOpt.h
index 682aeb746bb..692a64cdd22 100644
--- a/opt/unterface/UnterfaceOpt.h
+++ b/opt/unterface/UnterfaceOpt.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/verifier/Verifier.cpp b/opt/verifier/Verifier.cpp
index 4128b90d08c..92c655a70f3 100644
--- a/opt/verifier/Verifier.cpp
+++ b/opt/verifier/Verifier.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Verifier.h"
diff --git a/opt/verifier/Verifier.h b/opt/verifier/Verifier.h
index 378536fcb04..95d1aea1175 100644
--- a/opt/verifier/Verifier.h
+++ b/opt/verifier/Verifier.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/opt/virtual_scope/MethodDevirtualizationPass.cpp b/opt/virtual_scope/MethodDevirtualizationPass.cpp
index dc146962a48..b2f94bb2e5f 100644
--- a/opt/virtual_scope/MethodDevirtualizationPass.cpp
+++ b/opt/virtual_scope/MethodDevirtualizationPass.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "MethodDevirtualizationPass.h"
diff --git a/opt/virtual_scope/MethodDevirtualizationPass.h b/opt/virtual_scope/MethodDevirtualizationPass.h
index b9d9a9e60cc..e4b009bffba 100644
--- a/opt/virtual_scope/MethodDevirtualizationPass.h
+++ b/opt/virtual_scope/MethodDevirtualizationPass.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/pyredex/__init__.py b/pyredex/__init__.py
index f83d651288b..6264236915a 100644
--- a/pyredex/__init__.py
+++ b/pyredex/__init__.py
@@ -1,6 +1,4 @@
-# Copyright (c) 2016-present, Facebook, Inc.
-# All rights reserved.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
diff --git a/pyredex/logger.py b/pyredex/logger.py
index 5401483d188..b9d6079ffb0 100644
--- a/pyredex/logger.py
+++ b/pyredex/logger.py
@@ -1,9 +1,7 @@
-# Copyright (c) 2016-present, Facebook, Inc.
-# All rights reserved.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 from __future__ import absolute_import
 from __future__ import division
diff --git a/pyredex/unpacker.py b/pyredex/unpacker.py
index f53de12d5b4..cad1033b66c 100644
--- a/pyredex/unpacker.py
+++ b/pyredex/unpacker.py
@@ -1,9 +1,7 @@
-# Copyright (c) 2016-present, Facebook, Inc.
-# All rights reserved.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 import hashlib
 import itertools
diff --git a/pyredex/utils.py b/pyredex/utils.py
index d35f7483672..d2ae3c3528d 100644
--- a/pyredex/utils.py
+++ b/pyredex/utils.py
@@ -1,9 +1,7 @@
-# Copyright (c) 2016-present, Facebook, Inc.
-# All rights reserved.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 import glob
 import shutil
diff --git a/redex.py b/redex.py
index 74a7877105f..02d16f825d9 100755
--- a/redex.py
+++ b/redex.py
@@ -1,11 +1,9 @@
 #!/usr/bin/env python
 
-# Copyright (c) 2016-present, Facebook, Inc.
-# All rights reserved.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 from __future__ import absolute_import
 from __future__ import division
diff --git a/service/constant-propagation/ConstantArrayDomain.h b/service/constant-propagation/ConstantArrayDomain.h
index 3e769985090..0752d240aa3 100644
--- a/service/constant-propagation/ConstantArrayDomain.h
+++ b/service/constant-propagation/ConstantArrayDomain.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/service/constant-propagation/ConstantEnvironment.cpp b/service/constant-propagation/ConstantEnvironment.cpp
index efa4fb4a44b..517a29324fe 100644
--- a/service/constant-propagation/ConstantEnvironment.cpp
+++ b/service/constant-propagation/ConstantEnvironment.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ConstantEnvironment.h"
diff --git a/service/constant-propagation/ConstantEnvironment.h b/service/constant-propagation/ConstantEnvironment.h
index fed7f627409..82636cca282 100644
--- a/service/constant-propagation/ConstantEnvironment.h
+++ b/service/constant-propagation/ConstantEnvironment.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/service/constant-propagation/ConstantPropagationAnalysis.cpp b/service/constant-propagation/ConstantPropagationAnalysis.cpp
index 7004e5c2d86..5a39d7d397c 100644
--- a/service/constant-propagation/ConstantPropagationAnalysis.cpp
+++ b/service/constant-propagation/ConstantPropagationAnalysis.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ConstantPropagationAnalysis.h"
diff --git a/service/constant-propagation/ConstantPropagationAnalysis.h b/service/constant-propagation/ConstantPropagationAnalysis.h
index 836c5beb79c..c6199a3a915 100644
--- a/service/constant-propagation/ConstantPropagationAnalysis.h
+++ b/service/constant-propagation/ConstantPropagationAnalysis.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/service/constant-propagation/ConstantPropagationWholeProgramState.cpp b/service/constant-propagation/ConstantPropagationWholeProgramState.cpp
index ef15be055dd..38bcf112c2c 100644
--- a/service/constant-propagation/ConstantPropagationWholeProgramState.cpp
+++ b/service/constant-propagation/ConstantPropagationWholeProgramState.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ConstantPropagationWholeProgramState.h"
diff --git a/service/constant-propagation/ConstantPropagationWholeProgramState.h b/service/constant-propagation/ConstantPropagationWholeProgramState.h
index 34fd77688e8..18bf5553941 100644
--- a/service/constant-propagation/ConstantPropagationWholeProgramState.h
+++ b/service/constant-propagation/ConstantPropagationWholeProgramState.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/service/constant-propagation/IPConstantPropagationAnalysis.cpp b/service/constant-propagation/IPConstantPropagationAnalysis.cpp
index cfa760243dc..139c7fc1745 100644
--- a/service/constant-propagation/IPConstantPropagationAnalysis.cpp
+++ b/service/constant-propagation/IPConstantPropagationAnalysis.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "IPConstantPropagationAnalysis.h"
diff --git a/service/constant-propagation/IPConstantPropagationAnalysis.h b/service/constant-propagation/IPConstantPropagationAnalysis.h
index eaca143d65f..1c791e21785 100644
--- a/service/constant-propagation/IPConstantPropagationAnalysis.h
+++ b/service/constant-propagation/IPConstantPropagationAnalysis.h
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc. * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/service/constant-propagation/ObjectDomain.cpp b/service/constant-propagation/ObjectDomain.cpp
index 96899bacc9a..eae66b53018 100644
--- a/service/constant-propagation/ObjectDomain.cpp
+++ b/service/constant-propagation/ObjectDomain.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ObjectDomain.h"
diff --git a/service/constant-propagation/ObjectDomain.h b/service/constant-propagation/ObjectDomain.h
index dabf029e34e..6997d6b11c7 100644
--- a/service/constant-propagation/ObjectDomain.h
+++ b/service/constant-propagation/ObjectDomain.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/service/constant-propagation/SignDomain.cpp b/service/constant-propagation/SignDomain.cpp
index c9533d7b593..6e51fdf47c7 100644
--- a/service/constant-propagation/SignDomain.cpp
+++ b/service/constant-propagation/SignDomain.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "SignDomain.h"
diff --git a/service/constant-propagation/SignDomain.h b/service/constant-propagation/SignDomain.h
index 77e33fe261a..cc790387f08 100644
--- a/service/constant-propagation/SignDomain.h
+++ b/service/constant-propagation/SignDomain.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/service/constant-propagation/SignedConstantDomain.h b/service/constant-propagation/SignedConstantDomain.h
index 36c222fe820..bf794ef4116 100644
--- a/service/constant-propagation/SignedConstantDomain.h
+++ b/service/constant-propagation/SignedConstantDomain.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/service/dataflow/LiveRange.cpp b/service/dataflow/LiveRange.cpp
index e33d25e9e3f..fbbc58c7d6a 100644
--- a/service/dataflow/LiveRange.cpp
+++ b/service/dataflow/LiveRange.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "LiveRange.h"
diff --git a/service/dataflow/LiveRange.h b/service/dataflow/LiveRange.h
index be1885b7a06..20cb27373c3 100644
--- a/service/dataflow/LiveRange.h
+++ b/service/dataflow/LiveRange.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <boost/functional/hash.hpp>
diff --git a/service/dataflow/Liveness.h b/service/dataflow/Liveness.h
index 03f3fb63de3..c81d7e19e46 100644
--- a/service/dataflow/Liveness.h
+++ b/service/dataflow/Liveness.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/service/escape-analysis/LocalPointersAnalysis.h b/service/escape-analysis/LocalPointersAnalysis.h
index 2a87c8c617f..cd0864a3b32 100644
--- a/service/escape-analysis/LocalPointersAnalysis.h
+++ b/service/escape-analysis/LocalPointersAnalysis.h
@@ -1,11 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional
- * grant of patent rights can be found in the PATENTS file in the same
- * directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/service/reference-update/MethodReference.cpp b/service/reference-update/MethodReference.cpp
index b0a2a3f5ae3..130a8593774 100644
--- a/service/reference-update/MethodReference.cpp
+++ b/service/reference-update/MethodReference.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2018-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "MethodReference.h"
diff --git a/service/reference-update/MethodReference.h b/service/reference-update/MethodReference.h
index 7c212aac5c0..b26189a58e4 100644
--- a/service/reference-update/MethodReference.h
+++ b/service/reference-update/MethodReference.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2018-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/service/reference-update/TypeReference.cpp b/service/reference-update/TypeReference.cpp
index f126850b06a..61a0fd719b6 100644
--- a/service/reference-update/TypeReference.cpp
+++ b/service/reference-update/TypeReference.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2018-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "TypeReference.h"
diff --git a/service/reference-update/TypeReference.h b/service/reference-update/TypeReference.h
index 940fb8835ef..8f74a15a907 100644
--- a/service/reference-update/TypeReference.h
+++ b/service/reference-update/TypeReference.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2018-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/service/switch-dispatch/SwitchDispatch.cpp b/service/switch-dispatch/SwitchDispatch.cpp
index 7ec16d4ea44..212391094e0 100644
--- a/service/switch-dispatch/SwitchDispatch.cpp
+++ b/service/switch-dispatch/SwitchDispatch.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2018-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "SwitchDispatch.h"
diff --git a/service/switch-dispatch/SwitchDispatch.h b/service/switch-dispatch/SwitchDispatch.h
index bbc97a54e08..995215bdf8f 100644
--- a/service/switch-dispatch/SwitchDispatch.h
+++ b/service/switch-dispatch/SwitchDispatch.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2018-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/shared/DexDefs.cpp b/shared/DexDefs.cpp
index ffc8b3c160e..b6d6a5539df 100644
--- a/shared/DexDefs.cpp
+++ b/shared/DexDefs.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
-#include "DexDefs.h"
\ No newline at end of file
+#include "DexDefs.h"
diff --git a/shared/DexDefs.h b/shared/DexDefs.h
index f4ae16c8bae..fc0f23ad190 100644
--- a/shared/DexDefs.h
+++ b/shared/DexDefs.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/shared/DexEncoding.h b/shared/DexEncoding.h
index be1668b13be..2efb16db880 100644
--- a/shared/DexEncoding.h
+++ b/shared/DexEncoding.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/shared/DexOpcodeDefs.cpp b/shared/DexOpcodeDefs.cpp
index 1305aaed26e..1bef31a6bf4 100644
--- a/shared/DexOpcodeDefs.cpp
+++ b/shared/DexOpcodeDefs.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "DexOpcodeDefs.h"
diff --git a/shared/DexOpcodeDefs.h b/shared/DexOpcodeDefs.h
index 682d8b6affa..0fc6a58e4f5 100644
--- a/shared/DexOpcodeDefs.h
+++ b/shared/DexOpcodeDefs.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/shared/QuickData.cpp b/shared/QuickData.cpp
index 127f832071b..f072e59bd55 100644
--- a/shared/QuickData.cpp
+++ b/shared/QuickData.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "QuickData.h"
diff --git a/shared/QuickData.h b/shared/QuickData.h
index f28d4147ac8..33907007b5c 100644
--- a/shared/QuickData.h
+++ b/shared/QuickData.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/shared/Util.h b/shared/Util.h
index 283833a14fb..a978b0dcb5a 100644
--- a/shared/Util.h
+++ b/shared/Util.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/shared/file-utils.cpp b/shared/file-utils.cpp
index 399d610e44f..a3ff52629d0 100644
--- a/shared/file-utils.cpp
+++ b/shared/file-utils.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "file-utils.h"
diff --git a/shared/file-utils.h b/shared/file-utils.h
index 43f0de3c6a8..1bf4fb83bee 100644
--- a/shared/file-utils.h
+++ b/shared/file-utils.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/shared/mmap.cpp b/shared/mmap.cpp
index 7ddc1c0b0bb..6bdb64277ff 100644
--- a/shared/mmap.cpp
+++ b/shared/mmap.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "mmap.h"
diff --git a/shared/mmap.h b/shared/mmap.h
index 56c70e0b7bb..19ee8492c8e 100644
--- a/shared/mmap.h
+++ b/shared/mmap.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Util.h"
diff --git a/test/bisect-passes.py b/test/bisect-passes.py
index 3c77d201fc7..9016ac665da 100755
--- a/test/bisect-passes.py
+++ b/test/bisect-passes.py
@@ -1,11 +1,9 @@
 #!/usr/bin/env python
 
-# Copyright (c) 2016-present, Facebook, Inc.
-# All rights reserved.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 from __future__ import absolute_import
 from __future__ import division
diff --git a/test/common/RedexTest.h b/test/common/RedexTest.h
index a2d55393320..7fc15e2a579 100644
--- a/test/common/RedexTest.h
+++ b/test/common/RedexTest.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/test/equivalence/EquivalenceMain.java b/test/equivalence/EquivalenceMain.java
index 7097b1c22ec..b6daaa9d994 100644
--- a/test/equivalence/EquivalenceMain.java
+++ b/test/equivalence/EquivalenceMain.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.equivalence;
diff --git a/test/equivalence/InlinerTests.cpp b/test/equivalence/InlinerTests.cpp
index efc9313cbb1..60e35b4a32a 100644
--- a/test/equivalence/InlinerTests.cpp
+++ b/test/equivalence/InlinerTests.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <string>
diff --git a/test/equivalence/LocalDceTests.cpp b/test/equivalence/LocalDceTests.cpp
index b60c0edd597..c62c6e210f1 100644
--- a/test/equivalence/LocalDceTests.cpp
+++ b/test/equivalence/LocalDceTests.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "DexAsm.h"
diff --git a/test/equivalence/TestGenerator.cpp b/test/equivalence/TestGenerator.cpp
index 2970ab04d82..ff46c7231c9 100644
--- a/test/equivalence/TestGenerator.cpp
+++ b/test/equivalence/TestGenerator.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <algorithm>
diff --git a/test/equivalence/TestGenerator.h b/test/equivalence/TestGenerator.h
index 9a45329ba36..589b104c7bf 100644
--- a/test/equivalence/TestGenerator.h
+++ b/test/equivalence/TestGenerator.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/test/instr/AccessMarkingTest.java b/test/instr/AccessMarkingTest.java
index 8415361bf8c..ef5235c7bfb 100644
--- a/test/instr/AccessMarkingTest.java
+++ b/test/instr/AccessMarkingTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package redex;
diff --git a/test/instr/AccessMarkingVerify.cpp b/test/instr/AccessMarkingVerify.cpp
index 5a2271999c5..909d7a97cba 100644
--- a/test/instr/AccessMarkingVerify.cpp
+++ b/test/instr/AccessMarkingVerify.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/instr/AllocInvokeRangeTest.java b/test/instr/AllocInvokeRangeTest.java
index 132a369467f..1bf5b91e8fb 100644
--- a/test/instr/AllocInvokeRangeTest.java
+++ b/test/instr/AllocInvokeRangeTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.instr;
diff --git a/test/instr/ConstantPropagationTest.cpp b/test/instr/ConstantPropagationTest.cpp
index 5c6edfc0d54..cb37547a9df 100644
--- a/test/instr/ConstantPropagationTest.cpp
+++ b/test/instr/ConstantPropagationTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/instr/ConstantPropagationTest.java b/test/instr/ConstantPropagationTest.java
index 48d6b9e4314..1052ac9e026 100644
--- a/test/instr/ConstantPropagationTest.java
+++ b/test/instr/ConstantPropagationTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package redex;
diff --git a/test/instr/ControlFlowTest.java b/test/instr/ControlFlowTest.java
index b4daf6d6e9c..8fdfef18906 100644
--- a/test/instr/ControlFlowTest.java
+++ b/test/instr/ControlFlowTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.instr;
diff --git a/test/instr/DelSuperPostVerify.cpp b/test/instr/DelSuperPostVerify.cpp
index 12195c01f2d..d685a246c1c 100644
--- a/test/instr/DelSuperPostVerify.cpp
+++ b/test/instr/DelSuperPostVerify.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cstdint>
diff --git a/test/instr/DelSuperTest.java b/test/instr/DelSuperTest.java
index 857232085a7..c58c64d5e79 100644
--- a/test/instr/DelSuperTest.java
+++ b/test/instr/DelSuperTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.instr;
diff --git a/test/instr/EmptyClasses.java b/test/instr/EmptyClasses.java
index b65d50ac556..afdb714098f 100644
--- a/test/instr/EmptyClasses.java
+++ b/test/instr/EmptyClasses.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redextest;
diff --git a/test/instr/EmptyClassesTest.cpp b/test/instr/EmptyClassesTest.cpp
index 6f33b4c01ed..16d11cc5b29 100644
--- a/test/instr/EmptyClassesTest.cpp
+++ b/test/instr/EmptyClassesTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cstdlib>
diff --git a/test/instr/EmptyClassesTest.java b/test/instr/EmptyClassesTest.java
index 874ec2f4390..0f2f483137e 100644
--- a/test/instr/EmptyClassesTest.java
+++ b/test/instr/EmptyClassesTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redextest;
diff --git a/test/instr/ForceInline.java b/test/instr/ForceInline.java
index 2449cb03cb6..ab368621ab8 100644
--- a/test/instr/ForceInline.java
+++ b/test/instr/ForceInline.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redexinline;
diff --git a/test/instr/InstrumentAnalysis.java b/test/instr/InstrumentAnalysis.java
index cfc1a2a78ad..8b6c5058bb2 100644
--- a/test/instr/InstrumentAnalysis.java
+++ b/test/instr/InstrumentAnalysis.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redextest;
diff --git a/test/instr/InstrumentTarget.java b/test/instr/InstrumentTarget.java
index a3077d8a1d6..38282496cfe 100644
--- a/test/instr/InstrumentTarget.java
+++ b/test/instr/InstrumentTarget.java
@@ -1,10 +1,8 @@
-/*
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * Copyright (c) 2016-present, Facebook, Inc. All rights reserved.
- *
- * <p>This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.redextest;
 
diff --git a/test/instr/InstrumentVerify.cpp b/test/instr/InstrumentVerify.cpp
index 812c367f6df..b734b91cecf 100644
--- a/test/instr/InstrumentVerify.cpp
+++ b/test/instr/InstrumentVerify.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/instr/KeepForRedexTest.java b/test/instr/KeepForRedexTest.java
index bc1c771f5ab..f8d3d1e3d3b 100644
--- a/test/instr/KeepForRedexTest.java
+++ b/test/instr/KeepForRedexTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.instr;
diff --git a/test/instr/MethodDevirtualizationTest.java b/test/instr/MethodDevirtualizationTest.java
index fd8c4246807..a27eced5901 100644
--- a/test/instr/MethodDevirtualizationTest.java
+++ b/test/instr/MethodDevirtualizationTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/test/instr/MethodDevirtualizationVerify.cpp b/test/instr/MethodDevirtualizationVerify.cpp
index 245f77bad0e..2e0cdd40df0 100644
--- a/test/instr/MethodDevirtualizationVerify.cpp
+++ b/test/instr/MethodDevirtualizationVerify.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/instr/NativeOutlinerPostVerify.cpp b/test/instr/NativeOutlinerPostVerify.cpp
index c51b8a7f8d7..5cf0322b961 100644
--- a/test/instr/NativeOutlinerPostVerify.cpp
+++ b/test/instr/NativeOutlinerPostVerify.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <boost/filesystem.hpp>
diff --git a/test/instr/NativeOutlinerTest.java b/test/instr/NativeOutlinerTest.java
index 47b71481b2b..8b55ffc1fcb 100644
--- a/test/instr/NativeOutlinerTest.java
+++ b/test/instr/NativeOutlinerTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.instr;
diff --git a/test/instr/ObfuscateTest.java b/test/instr/ObfuscateTest.java
index cd872a65784..50967b2e7c7 100644
--- a/test/instr/ObfuscateTest.java
+++ b/test/instr/ObfuscateTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.instr;
diff --git a/test/instr/OutlineThrowPostVerify.cpp b/test/instr/OutlineThrowPostVerify.cpp
index 7908a46a831..3c7a8674b2c 100644
--- a/test/instr/OutlineThrowPostVerify.cpp
+++ b/test/instr/OutlineThrowPostVerify.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cstdint>
diff --git a/test/instr/OutlineThrowTest.java b/test/instr/OutlineThrowTest.java
index 6293acfb904..56b8280eb0b 100644
--- a/test/instr/OutlineThrowTest.java
+++ b/test/instr/OutlineThrowTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.instr;
diff --git a/test/instr/RedexTest.java b/test/instr/RedexTest.java
index 8116947fa95..13e41279f74 100644
--- a/test/instr/RedexTest.java
+++ b/test/instr/RedexTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.instr;
diff --git a/test/instr/ReferencedDeadCodeTest.java b/test/instr/ReferencedDeadCodeTest.java
index 93141767e41..ba4d21b5eb9 100644
--- a/test/instr/ReferencedDeadCodeTest.java
+++ b/test/instr/ReferencedDeadCodeTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.instr;
diff --git a/test/instr/RemoveBuildersTest.cpp b/test/instr/RemoveBuildersTest.cpp
index da78ee66911..57b76d639bf 100644
--- a/test/instr/RemoveBuildersTest.cpp
+++ b/test/instr/RemoveBuildersTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cstdint>
diff --git a/test/instr/RemoveBuildersTest.java b/test/instr/RemoveBuildersTest.java
index 118bd5cb008..b508f0a8464 100644
--- a/test/instr/RemoveBuildersTest.java
+++ b/test/instr/RemoveBuildersTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.instr;
diff --git a/test/instr/RemoveUnusedClass.java b/test/instr/RemoveUnusedClass.java
index 9620f002d84..1ded4eac305 100644
--- a/test/instr/RemoveUnusedClass.java
+++ b/test/instr/RemoveUnusedClass.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.instr;
diff --git a/test/instr/RenameClassesTest.java b/test/instr/RenameClassesTest.java
index 7c8cc1134ea..aad0611c2a9 100644
--- a/test/instr/RenameClassesTest.java
+++ b/test/instr/RenameClassesTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.instr;
diff --git a/test/instr/RenameClassesV2PostVerify.cpp b/test/instr/RenameClassesV2PostVerify.cpp
index ae6d70fabe3..c5eff8add30 100644
--- a/test/instr/RenameClassesV2PostVerify.cpp
+++ b/test/instr/RenameClassesV2PostVerify.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cstdint>
diff --git a/test/instr/RenameClassesV2Test.java b/test/instr/RenameClassesV2Test.java
index 2c6bf50b4a1..a306e015492 100644
--- a/test/instr/RenameClassesV2Test.java
+++ b/test/instr/RenameClassesV2Test.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.instr;
diff --git a/test/instr/ReplaceEncodableClinitTest.java b/test/instr/ReplaceEncodableClinitTest.java
index f6837efd43a..eb3f82d049c 100644
--- a/test/instr/ReplaceEncodableClinitTest.java
+++ b/test/instr/ReplaceEncodableClinitTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package redex;
diff --git a/test/instr/ReplaceEncodableClinitVerify.cpp b/test/instr/ReplaceEncodableClinitVerify.cpp
index 20f8d3bb751..b587c750ee0 100644
--- a/test/instr/ReplaceEncodableClinitVerify.cpp
+++ b/test/instr/ReplaceEncodableClinitVerify.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <algorithm>
diff --git a/test/instr/SafeSynthGetterRemoval.java b/test/instr/SafeSynthGetterRemoval.java
index 9de2bf01dc0..0de6e4256f2 100644
--- a/test/instr/SafeSynthGetterRemoval.java
+++ b/test/instr/SafeSynthGetterRemoval.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.instr;
diff --git a/test/instr/SimpleInlineOtherPackage.java b/test/instr/SimpleInlineOtherPackage.java
index f0a70a6be9e..9e1bf90b255 100644
--- a/test/instr/SimpleInlineOtherPackage.java
+++ b/test/instr/SimpleInlineOtherPackage.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redexinline.otherpackage;
diff --git a/test/instr/SimpleInlineTest.java b/test/instr/SimpleInlineTest.java
index 883de1d150d..3358890e9e0 100644
--- a/test/instr/SimpleInlineTest.java
+++ b/test/instr/SimpleInlineTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redexinline;
diff --git a/test/instr/SimpleInlineVerify.cpp b/test/instr/SimpleInlineVerify.cpp
index 3a2088aa69e..3de3703f19c 100644
--- a/test/instr/SimpleInlineVerify.cpp
+++ b/test/instr/SimpleInlineVerify.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <algorithm>
diff --git a/test/instr/SimplifyString.java b/test/instr/SimplifyString.java
index 97aa05f883e..b5c578995ce 100644
--- a/test/instr/SimplifyString.java
+++ b/test/instr/SimplifyString.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.instr;
diff --git a/test/instr/SimplifyStringVerify.cpp b/test/instr/SimplifyStringVerify.cpp
index 91a102fb863..93867ee9d1f 100644
--- a/test/instr/SimplifyStringVerify.cpp
+++ b/test/instr/SimplifyStringVerify.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <algorithm>
diff --git a/test/instr/StaticReloTest.java b/test/instr/StaticReloTest.java
index 841cd2f0755..1c38fed46ad 100644
--- a/test/instr/StaticReloTest.java
+++ b/test/instr/StaticReloTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.instr;
diff --git a/test/instr/StripDebugInfo.java b/test/instr/StripDebugInfo.java
index 5a93e88be53..646ca999771 100644
--- a/test/instr/StripDebugInfo.java
+++ b/test/instr/StripDebugInfo.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redextest;
diff --git a/test/instr/StripDebugInfoTest.cpp b/test/instr/StripDebugInfoTest.cpp
index 866ce1e5770..7a9317efa5a 100644
--- a/test/instr/StripDebugInfoTest.cpp
+++ b/test/instr/StripDebugInfoTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cstdlib>
diff --git a/test/instr/Synth2Test.java b/test/instr/Synth2Test.java
index a3f0e6e1c9a..a8a0bf4ea04 100644
--- a/test/instr/Synth2Test.java
+++ b/test/instr/Synth2Test.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.instr;
diff --git a/test/instr/SynthMethodTest.java b/test/instr/SynthMethodTest.java
index 34388c90f62..28f0f11f4d1 100644
--- a/test/instr/SynthMethodTest.java
+++ b/test/instr/SynthMethodTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.instr;
diff --git a/test/instr/SynthWrapperCollisionTest.java b/test/instr/SynthWrapperCollisionTest.java
index cf1d8223984..a70a60492e2 100644
--- a/test/instr/SynthWrapperCollisionTest.java
+++ b/test/instr/SynthWrapperCollisionTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.instr;
diff --git a/test/instr/UnterfaceTest.java b/test/instr/UnterfaceTest.java
index 5d717e9ceb4..887566b45b5 100644
--- a/test/instr/UnterfaceTest.java
+++ b/test/instr/UnterfaceTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redextest;
diff --git a/test/instr/Utils.java b/test/instr/Utils.java
index be8c553688e..82ca0d6fe90 100644
--- a/test/instr/Utils.java
+++ b/test/instr/Utils.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.instr;
diff --git a/test/instr/VerifyUtil.cpp b/test/instr/VerifyUtil.cpp
index 6872adc187b..7284f5c6481 100644
--- a/test/instr/VerifyUtil.cpp
+++ b/test/instr/VerifyUtil.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <algorithm>
diff --git a/test/instr/VerifyUtil.h b/test/instr/VerifyUtil.h
index 1c0ab7fddec..3ad8237e3b4 100644
--- a/test/instr/VerifyUtil.h
+++ b/test/instr/VerifyUtil.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/test/instr/WrappedGetterTest.java b/test/instr/WrappedGetterTest.java
index fa9d7fbc4c5..346bcef17a9 100644
--- a/test/instr/WrappedGetterTest.java
+++ b/test/instr/WrappedGetterTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.instr;
diff --git a/test/integ/Alpha.java b/test/integ/Alpha.java
index 77861b9e6e2..d0eadf672da 100644
--- a/test/integ/Alpha.java
+++ b/test/integ/Alpha.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redextest;
diff --git a/test/integ/ConstantPropagation.java b/test/integ/ConstantPropagation.java
index 56de5a026fe..10464b5abdc 100644
--- a/test/integ/ConstantPropagation.java
+++ b/test/integ/ConstantPropagation.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/test/integ/ConstantPropagationTest.cpp b/test/integ/ConstantPropagationTest.cpp
index d273576abb8..b724c2e160b 100644
--- a/test/integ/ConstantPropagationTest.cpp
+++ b/test/integ/ConstantPropagationTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/integ/CopyPropagationTest.cpp b/test/integ/CopyPropagationTest.cpp
index d2a8d8d199e..13da86a47bb 100644
--- a/test/integ/CopyPropagationTest.cpp
+++ b/test/integ/CopyPropagationTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/integ/CopyPropagationTest.java b/test/integ/CopyPropagationTest.java
index 61d52bd96bb..4921b7f1814 100644
--- a/test/integ/CopyPropagationTest.java
+++ b/test/integ/CopyPropagationTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redextest;
diff --git a/test/integ/DedupBlocksTest.cpp b/test/integ/DedupBlocksTest.cpp
index 79bd3946175..0c65e06957e 100644
--- a/test/integ/DedupBlocksTest.cpp
+++ b/test/integ/DedupBlocksTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/integ/DedupBlocksTest.java b/test/integ/DedupBlocksTest.java
index d4a266cc7ec..d1320812897 100644
--- a/test/integ/DedupBlocksTest.java
+++ b/test/integ/DedupBlocksTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redextest;
diff --git a/test/integ/EnumOrdinalAnalysisTest.cpp b/test/integ/EnumOrdinalAnalysisTest.cpp
index 7a1293d3840..995b90642f5 100644
--- a/test/integ/EnumOrdinalAnalysisTest.cpp
+++ b/test/integ/EnumOrdinalAnalysisTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "EnumOrdinalAnalysis.h"
diff --git a/test/integ/Enums.java b/test/integ/Enums.java
index a168c94746a..6b05ad27ac8 100644
--- a/test/integ/Enums.java
+++ b/test/integ/Enums.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redextest;
diff --git a/test/integ/ImmutableSubcomponentAnalyzer.java b/test/integ/ImmutableSubcomponentAnalyzer.java
index 196d690f716..489a76d7810 100644
--- a/test/integ/ImmutableSubcomponentAnalyzer.java
+++ b/test/integ/ImmutableSubcomponentAnalyzer.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redextest;
diff --git a/test/integ/ImmutableSubcomponentAnalyzerTest.cpp b/test/integ/ImmutableSubcomponentAnalyzerTest.cpp
index 0157c1562b6..d3ac878b948 100644
--- a/test/integ/ImmutableSubcomponentAnalyzerTest.cpp
+++ b/test/integ/ImmutableSubcomponentAnalyzerTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gmock/gmock.h>
diff --git a/test/integ/MonotonicFixpoint.java b/test/integ/MonotonicFixpoint.java
index e26bec37ac4..4f33a0181cd 100644
--- a/test/integ/MonotonicFixpoint.java
+++ b/test/integ/MonotonicFixpoint.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redextest;
diff --git a/test/integ/MonotonicFixpointTest.cpp b/test/integ/MonotonicFixpointTest.cpp
index bcd9d2bb948..feff2ec5718 100644
--- a/test/integ/MonotonicFixpointTest.cpp
+++ b/test/integ/MonotonicFixpointTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "MonotonicFixpointIterator.h"
@@ -170,18 +168,18 @@ TEST(MonotonicFixpointTest, livenessAnalysis) {
               }
               if (it->type == MFLOW_POSITION) {
                 switch (it->pos->line) {
-                case 48: {
+                case 46: {
                   EXPECT_THAT(live_out.elements(),
                               ::testing::UnorderedElementsAre("v0", "v2"));
                   break;
                 }
-                case 49:
-                case 50: {
+                case 47:
+                case 48: {
                   EXPECT_THAT(live_out.elements(),
                               ::testing::UnorderedElementsAre("v1", "v2"));
                   break;
                 }
-                case 51: {
+                case 49: {
                   EXPECT_THAT(live_out.elements(),
                               ::testing::UnorderedElementsAre("v0", "v2"));
                   break;
diff --git a/test/integ/Peephole.java b/test/integ/Peephole.java
index e94fc7ea4b9..707856696c6 100644
--- a/test/integ/Peephole.java
+++ b/test/integ/Peephole.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/test/integ/PeepholeTest.cpp b/test/integ/PeepholeTest.cpp
index e6cf3673283..3b2224a0306 100644
--- a/test/integ/PeepholeTest.cpp
+++ b/test/integ/PeepholeTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/integ/PointsToSemantics.java b/test/integ/PointsToSemantics.java
index c0e028ec77c..33ecdaea030 100644
--- a/test/integ/PointsToSemantics.java
+++ b/test/integ/PointsToSemantics.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redextest;
diff --git a/test/integ/PointsToSemanticsTest.cpp b/test/integ/PointsToSemanticsTest.cpp
index a368aefb747..1888261a7e0 100644
--- a/test/integ/PointsToSemanticsTest.cpp
+++ b/test/integ/PointsToSemanticsTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "PointsToSemantics.h"
diff --git a/test/integ/Propagation.java b/test/integ/Propagation.java
index dbe34fc6d7e..730ba16a3a3 100644
--- a/test/integ/Propagation.java
+++ b/test/integ/Propagation.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 
diff --git a/test/integ/PropagationTest.cpp b/test/integ/PropagationTest.cpp
index 1a0551a08cc..45ebcb67888 100644
--- a/test/integ/PropagationTest.cpp
+++ b/test/integ/PropagationTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 
diff --git a/test/integ/ReachableClasses.java b/test/integ/ReachableClasses.java
index 43c2e690a09..80b685197ec 100644
--- a/test/integ/ReachableClasses.java
+++ b/test/integ/ReachableClasses.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redextest;
diff --git a/test/integ/ReachableClassesTest.cpp b/test/integ/ReachableClassesTest.cpp
index 78c23e806e2..0d7497d7908 100644
--- a/test/integ/ReachableClassesTest.cpp
+++ b/test/integ/ReachableClassesTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cstdlib>
diff --git a/test/integ/RemoveUnreachableTest.cpp b/test/integ/RemoveUnreachableTest.cpp
index 303b5a24486..6f63a6f11f4 100644
--- a/test/integ/RemoveUnreachableTest.cpp
+++ b/test/integ/RemoveUnreachableTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/integ/RemoveUnreachableTest.java b/test/integ/RemoveUnreachableTest.java
index 97df7e80167..9069345f4b7 100644
--- a/test/integ/RemoveUnreachableTest.java
+++ b/test/integ/RemoveUnreachableTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 class A {
diff --git a/test/integ/SimpleReflectionAnalysis.java b/test/integ/SimpleReflectionAnalysis.java
index b650326deb2..9354ffe2317 100644
--- a/test/integ/SimpleReflectionAnalysis.java
+++ b/test/integ/SimpleReflectionAnalysis.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
  package com.facebook.redextest;
diff --git a/test/integ/SimpleReflectionAnalysisTest.cpp b/test/integ/SimpleReflectionAnalysisTest.cpp
index 69898d9419f..a8255edbf65 100644
--- a/test/integ/SimpleReflectionAnalysisTest.cpp
+++ b/test/integ/SimpleReflectionAnalysisTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "SimpleReflectionAnalysis.h"
diff --git a/test/integ/StripDebugInfo.java b/test/integ/StripDebugInfo.java
index 5a93e88be53..646ca999771 100644
--- a/test/integ/StripDebugInfo.java
+++ b/test/integ/StripDebugInfo.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redextest;
diff --git a/test/integ/StripDebugInfoTest.cpp b/test/integ/StripDebugInfoTest.cpp
index d3bbb7f25a7..5d43a0bb408 100644
--- a/test/integ/StripDebugInfoTest.cpp
+++ b/test/integ/StripDebugInfoTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/integ/SynthTest.cpp b/test/integ/SynthTest.cpp
index 767d0e4ea41..f83b0f4745c 100644
--- a/test/integ/SynthTest.cpp
+++ b/test/integ/SynthTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cstdint>
diff --git a/test/integ/SynthTest.java b/test/integ/SynthTest.java
index 5fc61f9480b..0354c447258 100644
--- a/test/integ/SynthTest.java
+++ b/test/integ/SynthTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redextest;
diff --git a/test/line_map/DisabledLineMapTest.java b/test/line_map/DisabledLineMapTest.java
index cca545c8235..b01ca7cbf59 100644
--- a/test/line_map/DisabledLineMapTest.java
+++ b/test/line_map/DisabledLineMapTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redexlinemap;
@@ -33,8 +31,8 @@ public void testStackTraceWithoutLineMap() {
     } catch (Exception e) {
       List<StackTraceElement> trace = Arrays.asList(e.getStackTrace());
       assertThat(TraceUtil.traceToString(trace, 2)).isEqualTo(Arrays.asList(
-       "com.facebook.redexlinemap.DisabledLineMapTest.wrapsThrow(DisabledLineMapTest.java:22)",
-       "com.facebook.redexlinemap.DisabledLineMapTest.testStackTraceWithoutLineMap(DisabledLineMapTest.java:26)"));
+       "com.facebook.redexlinemap.DisabledLineMapTest.wrapsThrow(DisabledLineMapTest.java:20)",
+       "com.facebook.redexlinemap.DisabledLineMapTest.testStackTraceWithoutLineMap(DisabledLineMapTest.java:24)"));
     }
   }
 }
diff --git a/test/line_map/InlineMain.java b/test/line_map/InlineMain.java
index a60e0b4e680..1ea2f888e29 100644
--- a/test/line_map/InlineMain.java
+++ b/test/line_map/InlineMain.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redexlinemap;
@@ -38,8 +36,8 @@ public void testBasic() throws Exception {
     } catch (Exception e) {
       ArrayList<StackTraceElement> trace = lm.mapStackTrace(e.getStackTrace());
       assertEquals(TraceUtil.traceToString(trace, 2), Arrays.asList(
-        "com.facebook.redexlinemap.InlineSeparateFile.wrapsThrow(InlineSeparateFile.java:14)",
-        "com.facebook.redexlinemap.InlineMain.testBasic(InlineMain.java:37)"
+        "com.facebook.redexlinemap.InlineSeparateFile.wrapsThrow(InlineSeparateFile.java:12)",
+        "com.facebook.redexlinemap.InlineMain.testBasic(InlineMain.java:35)"
       ));
     }
   }
@@ -54,9 +52,9 @@ public void testInlineOnce() throws Exception {
     } catch (Exception e) {
       ArrayList<StackTraceElement> trace = lm.mapStackTrace(e.getStackTrace());
       assertEquals(TraceUtil.traceToString(trace, 3), Arrays.asList(
-        "com.facebook.redexlinemap.InlineSeparateFile.wrapsThrow(InlineSeparateFile.java:14)",
-        "com.facebook.redexlinemap.InlineMain.testInlineOnce(InlineSeparateFile.java:18)",
-        "com.facebook.redexlinemap.InlineMain.testInlineOnce(InlineMain.java:53)"
+        "com.facebook.redexlinemap.InlineSeparateFile.wrapsThrow(InlineSeparateFile.java:12)",
+        "com.facebook.redexlinemap.InlineMain.testInlineOnce(InlineSeparateFile.java:16)",
+        "com.facebook.redexlinemap.InlineMain.testInlineOnce(InlineMain.java:51)"
       ));
     }
   }
@@ -71,10 +69,10 @@ public void testInlineTwice() throws Exception {
     } catch (Exception e) {
       ArrayList<StackTraceElement> trace = lm.mapStackTrace(e.getStackTrace());
       assertEquals(TraceUtil.traceToString(trace, 4), Arrays.asList(
-        "com.facebook.redexlinemap.InlineSeparateFile.wrapsThrow(InlineSeparateFile.java:14)",
-        "com.facebook.redexlinemap.InlineMain.testInlineTwice(InlineSeparateFile.java:22)",
-        "com.facebook.redexlinemap.InlineMain.testInlineTwice(InlineSeparateFile.java:26)",
-        "com.facebook.redexlinemap.InlineMain.testInlineTwice(InlineMain.java:70)"
+        "com.facebook.redexlinemap.InlineSeparateFile.wrapsThrow(InlineSeparateFile.java:12)",
+        "com.facebook.redexlinemap.InlineMain.testInlineTwice(InlineSeparateFile.java:20)",
+        "com.facebook.redexlinemap.InlineMain.testInlineTwice(InlineSeparateFile.java:24)",
+        "com.facebook.redexlinemap.InlineMain.testInlineTwice(InlineMain.java:68)"
       ));
     }
   }
@@ -100,8 +98,8 @@ public void testPositionReset() throws Exception {
     } catch (Exception e) {
       ArrayList<StackTraceElement> trace = lm.mapStackTrace(e.getStackTrace());
       assertEquals(TraceUtil.traceToString(trace, 2), Arrays.asList(
-       "com.facebook.redexlinemap.InlineMain.ignoreAndThrow(InlineMain.java:88)",
-       "com.facebook.redexlinemap.InlineMain.testPositionReset(InlineMain.java:99)"
+       "com.facebook.redexlinemap.InlineMain.ignoreAndThrow(InlineMain.java:86)",
+       "com.facebook.redexlinemap.InlineMain.testPositionReset(InlineMain.java:97)"
       ));
     }
   }
@@ -123,9 +121,9 @@ public void testElseThrows() throws Exception {
       assertEquals(
           TraceUtil.traceToString(trace, 3),
           Arrays.asList(
-            "com.facebook.redexlinemap.InlineSeparateFile.wrapsThrow(InlineSeparateFile.java:14)",
-            "com.facebook.redexlinemap.InlineMain.testElseThrows(InlineMain.java:113)",
-            "com.facebook.redexlinemap.InlineMain.testElseThrows(InlineMain.java:120)"));
+            "com.facebook.redexlinemap.InlineSeparateFile.wrapsThrow(InlineSeparateFile.java:12)",
+            "com.facebook.redexlinemap.InlineMain.testElseThrows(InlineMain.java:111)",
+            "com.facebook.redexlinemap.InlineMain.testElseThrows(InlineMain.java:118)"));
     }
   }
 }
diff --git a/test/line_map/InlineMainV2.java b/test/line_map/InlineMainV2.java
index f7cfcdbb8a1..5db7e974417 100644
--- a/test/line_map/InlineMainV2.java
+++ b/test/line_map/InlineMainV2.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redexlinemap;
@@ -38,8 +36,8 @@ public void testBasic() throws Exception {
     } catch (Exception e) {
       ArrayList<StackTraceElement> trace = lm.mapStackTrace(e.getStackTrace());
       assertEquals(TraceUtil.traceToString(trace, 2), Arrays.asList(
-        "com.facebook.redexlinemap.InlineSeparateFileV2.wrapsThrow(InlineSeparateFileV2.java:14)",
-        "com.facebook.redexlinemap.InlineMainV2.testBasic(InlineMainV2.java:37)"
+        "com.facebook.redexlinemap.InlineSeparateFileV2.wrapsThrow(InlineSeparateFileV2.java:12)",
+        "com.facebook.redexlinemap.InlineMainV2.testBasic(InlineMainV2.java:35)"
       ));
     }
   }
@@ -54,9 +52,9 @@ public void testInlineOnce() throws Exception {
     } catch (Exception e) {
       ArrayList<StackTraceElement> trace = lm.mapStackTrace(e.getStackTrace());
       assertEquals(TraceUtil.traceToString(trace, 3), Arrays.asList(
-        "com.facebook.redexlinemap.InlineSeparateFileV2.wrapsThrow(InlineSeparateFileV2.java:14)",
-        "com.facebook.redexlinemap.InlineSeparateFileV2.inlineOnce(InlineSeparateFileV2.java:18)",
-        "com.facebook.redexlinemap.InlineMainV2.testInlineOnce(InlineMainV2.java:53)"
+        "com.facebook.redexlinemap.InlineSeparateFileV2.wrapsThrow(InlineSeparateFileV2.java:12)",
+        "com.facebook.redexlinemap.InlineSeparateFileV2.inlineOnce(InlineSeparateFileV2.java:16)",
+        "com.facebook.redexlinemap.InlineMainV2.testInlineOnce(InlineMainV2.java:51)"
       ));
     }
   }
@@ -71,10 +69,10 @@ public void testInlineTwice() throws Exception {
     } catch (Exception e) {
       ArrayList<StackTraceElement> trace = lm.mapStackTrace(e.getStackTrace());
       assertEquals(TraceUtil.traceToString(trace, 4), Arrays.asList(
-        "com.facebook.redexlinemap.InlineSeparateFileV2.wrapsThrow(InlineSeparateFileV2.java:14)",
-        "com.facebook.redexlinemap.InlineSeparateFileV2.inlineOnce1(InlineSeparateFileV2.java:22)",
-        "com.facebook.redexlinemap.InlineSeparateFileV2.inlineTwice(InlineSeparateFileV2.java:26)",
-        "com.facebook.redexlinemap.InlineMainV2.testInlineTwice(InlineMainV2.java:70)"
+        "com.facebook.redexlinemap.InlineSeparateFileV2.wrapsThrow(InlineSeparateFileV2.java:12)",
+        "com.facebook.redexlinemap.InlineSeparateFileV2.inlineOnce1(InlineSeparateFileV2.java:20)",
+        "com.facebook.redexlinemap.InlineSeparateFileV2.inlineTwice(InlineSeparateFileV2.java:24)",
+        "com.facebook.redexlinemap.InlineMainV2.testInlineTwice(InlineMainV2.java:68)"
       ));
     }
   }
@@ -100,8 +98,8 @@ public void testPositionReset() throws Exception {
     } catch (Exception e) {
       ArrayList<StackTraceElement> trace = lm.mapStackTrace(e.getStackTrace());
       assertEquals(TraceUtil.traceToString(trace, 2), Arrays.asList(
-       "com.facebook.redexlinemap.InlineMainV2.ignoreAndThrow(InlineMainV2.java:88)",
-       "com.facebook.redexlinemap.InlineMainV2.testPositionReset(InlineMainV2.java:99)"
+       "com.facebook.redexlinemap.InlineMainV2.ignoreAndThrow(InlineMainV2.java:86)",
+       "com.facebook.redexlinemap.InlineMainV2.testPositionReset(InlineMainV2.java:97)"
       ));
     }
   }
@@ -123,9 +121,9 @@ public void testElseThrows() throws Exception {
       assertEquals(
           TraceUtil.traceToString(trace, 3),
           Arrays.asList(
-            "com.facebook.redexlinemap.InlineSeparateFileV2.wrapsThrow(InlineSeparateFileV2.java:14)",
-            "com.facebook.redexlinemap.InlineMainV2.elseThrows(InlineMainV2.java:113)",
-            "com.facebook.redexlinemap.InlineMainV2.testElseThrows(InlineMainV2.java:120)"));
+            "com.facebook.redexlinemap.InlineSeparateFileV2.wrapsThrow(InlineSeparateFileV2.java:12)",
+            "com.facebook.redexlinemap.InlineMainV2.elseThrows(InlineMainV2.java:111)",
+            "com.facebook.redexlinemap.InlineMainV2.testElseThrows(InlineMainV2.java:118)"));
     }
   }
 }
diff --git a/test/line_map/InlineSeparateFile.java b/test/line_map/InlineSeparateFile.java
index 843f83fb301..2706b2b2572 100644
--- a/test/line_map/InlineSeparateFile.java
+++ b/test/line_map/InlineSeparateFile.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redexlinemap;
diff --git a/test/line_map/InlineSeparateFileV2.java b/test/line_map/InlineSeparateFileV2.java
index b877c0e2e12..17730b51eb8 100644
--- a/test/line_map/InlineSeparateFileV2.java
+++ b/test/line_map/InlineSeparateFileV2.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redexlinemap;
diff --git a/test/line_map/LineMapper.java b/test/line_map/LineMapper.java
index f8693ae9118..4c712f50952 100644
--- a/test/line_map/LineMapper.java
+++ b/test/line_map/LineMapper.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redexlinemap;
diff --git a/test/line_map/LineMapperV2.java b/test/line_map/LineMapperV2.java
index 3c8d34c4506..0047d2099f1 100644
--- a/test/line_map/LineMapperV2.java
+++ b/test/line_map/LineMapperV2.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redexlinemap;
diff --git a/test/line_map/NoInline.java b/test/line_map/NoInline.java
index fe3a46e32c7..33020396367 100644
--- a/test/line_map/NoInline.java
+++ b/test/line_map/NoInline.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redexlinemap;
diff --git a/test/line_map/TraceUtil.java b/test/line_map/TraceUtil.java
index 8653c29c53d..eca41567d33 100644
--- a/test/line_map/TraceUtil.java
+++ b/test/line_map/TraceUtil.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redexlinemap;
diff --git a/test/line_map/add_assets.py b/test/line_map/add_assets.py
index d6f1eb6c140..b1000ce62c7 100755
--- a/test/line_map/add_assets.py
+++ b/test/line_map/add_assets.py
@@ -1,12 +1,10 @@
 #! /usr/bin/env python
 # @lint-ignore-every PYTHON3COMPATIMPORTS1
 
-# Copyright (c) 2016-present, Facebook, Inc.
-# All rights reserved.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 import argparse
 import os
diff --git a/test/obfuscation-e2e/FieldHierarchyObfuscationTest.cpp b/test/obfuscation-e2e/FieldHierarchyObfuscationTest.cpp
index 2d299628d9b..bf569ddd31b 100644
--- a/test/obfuscation-e2e/FieldHierarchyObfuscationTest.cpp
+++ b/test/obfuscation-e2e/FieldHierarchyObfuscationTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cstdint>
diff --git a/test/obfuscation-e2e/ProguardFieldObfuscationTest.cpp b/test/obfuscation-e2e/ProguardFieldObfuscationTest.cpp
index a46de67ccd2..0d21a36ba2e 100644
--- a/test/obfuscation-e2e/ProguardFieldObfuscationTest.cpp
+++ b/test/obfuscation-e2e/ProguardFieldObfuscationTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cstdint>
diff --git a/test/obfuscation-e2e/ProguardMethodObfuscationTest.cpp b/test/obfuscation-e2e/ProguardMethodObfuscationTest.cpp
index c9e4db43e76..43e9218f3d5 100644
--- a/test/obfuscation-e2e/ProguardMethodObfuscationTest.cpp
+++ b/test/obfuscation-e2e/ProguardMethodObfuscationTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cstdint>
diff --git a/test/obfuscation-e2e/ProguardObfuscationTest.cpp b/test/obfuscation-e2e/ProguardObfuscationTest.cpp
index 0b85dd0f884..9d5d8c8f9af 100644
--- a/test/obfuscation-e2e/ProguardObfuscationTest.cpp
+++ b/test/obfuscation-e2e/ProguardObfuscationTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ProguardObfuscationTest.h"
diff --git a/test/obfuscation-e2e/ProguardObfuscationTest.h b/test/obfuscation-e2e/ProguardObfuscationTest.h
index 6dcef0d7141..2959c8629eb 100644
--- a/test/obfuscation-e2e/ProguardObfuscationTest.h
+++ b/test/obfuscation-e2e/ProguardObfuscationTest.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/test/obfuscation-e2e/ProguardObfuscationTest.java b/test/obfuscation-e2e/ProguardObfuscationTest.java
index 9188049a800..b6935b43811 100644
--- a/test/obfuscation-e2e/ProguardObfuscationTest.java
+++ b/test/obfuscation-e2e/ProguardObfuscationTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/obfuscation-e2e/hierarchy/ImplOne.java b/test/obfuscation-e2e/hierarchy/ImplOne.java
index efb7e8941e3..9976956e97a 100644
--- a/test/obfuscation-e2e/hierarchy/ImplOne.java
+++ b/test/obfuscation-e2e/hierarchy/ImplOne.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/obfuscation-e2e/hierarchy/Intf.java b/test/obfuscation-e2e/hierarchy/Intf.java
index dd6c508192b..dffbc438a63 100644
--- a/test/obfuscation-e2e/hierarchy/Intf.java
+++ b/test/obfuscation-e2e/hierarchy/Intf.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/obfuscation-e2e/hierarchy/Sub.java b/test/obfuscation-e2e/hierarchy/Sub.java
index b3879a69a9c..fe59019a730 100644
--- a/test/obfuscation-e2e/hierarchy/Sub.java
+++ b/test/obfuscation-e2e/hierarchy/Sub.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/obfuscation-e2e/hierarchy/SubImpl.java b/test/obfuscation-e2e/hierarchy/SubImpl.java
index 811fce3745e..dc26e3822c0 100644
--- a/test/obfuscation-e2e/hierarchy/SubImpl.java
+++ b/test/obfuscation-e2e/hierarchy/SubImpl.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/obfuscation-e2e/hierarchy/SubSub.java b/test/obfuscation-e2e/hierarchy/SubSub.java
index 6f35e729a2b..17bb63ace55 100644
--- a/test/obfuscation-e2e/hierarchy/SubSub.java
+++ b/test/obfuscation-e2e/hierarchy/SubSub.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/obfuscation-e2e/hierarchy/TheSuper.java b/test/obfuscation-e2e/hierarchy/TheSuper.java
index 447e51478cb..b865fa4d696 100644
--- a/test/obfuscation-e2e/hierarchy/TheSuper.java
+++ b/test/obfuscation-e2e/hierarchy/TheSuper.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/obfuscation-e2e/simple/Alpha.java b/test/obfuscation-e2e/simple/Alpha.java
index 1f2461467bf..3df440aeb4d 100644
--- a/test/obfuscation-e2e/simple/Alpha.java
+++ b/test/obfuscation-e2e/simple/Alpha.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/obfuscation-e2e/simple/Beta.java b/test/obfuscation-e2e/simple/Beta.java
index 31a3b45e1f6..f20af99cf58 100644
--- a/test/obfuscation-e2e/simple/Beta.java
+++ b/test/obfuscation-e2e/simple/Beta.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/pg-config-e2e/Alpha.java b/test/pg-config-e2e/Alpha.java
index 8ca4dd9aa1b..be850d5b184 100644
--- a/test/pg-config-e2e/Alpha.java
+++ b/test/pg-config-e2e/Alpha.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/pg-config-e2e/Beta.java b/test/pg-config-e2e/Beta.java
index f63ef271f68..ec8ce0f4beb 100644
--- a/test/pg-config-e2e/Beta.java
+++ b/test/pg-config-e2e/Beta.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/pg-config-e2e/Delta.java b/test/pg-config-e2e/Delta.java
index 61a96ade765..64f7ed63ebf 100644
--- a/test/pg-config-e2e/Delta.java
+++ b/test/pg-config-e2e/Delta.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  * <p>
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/pg-config-e2e/DoNotStrip.java b/test/pg-config-e2e/DoNotStrip.java
index 0090fdad0fd..8bb26a8280b 100644
--- a/test/pg-config-e2e/DoNotStrip.java
+++ b/test/pg-config-e2e/DoNotStrip.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/pg-config-e2e/DontKillMe.java b/test/pg-config-e2e/DontKillMe.java
index 90e815faf6a..35714599a81 100644
--- a/test/pg-config-e2e/DontKillMe.java
+++ b/test/pg-config-e2e/DontKillMe.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/pg-config-e2e/Epsilon.java b/test/pg-config-e2e/Epsilon.java
index e5acbef6ea8..8614906aae2 100644
--- a/test/pg-config-e2e/Epsilon.java
+++ b/test/pg-config-e2e/Epsilon.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/pg-config-e2e/Eta.java b/test/pg-config-e2e/Eta.java
index 6efcfdd4c3c..c8c30c593d1 100644
--- a/test/pg-config-e2e/Eta.java
+++ b/test/pg-config-e2e/Eta.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/pg-config-e2e/Gamma.java b/test/pg-config-e2e/Gamma.java
index c145129b18c..b1cedb4141f 100644
--- a/test/pg-config-e2e/Gamma.java
+++ b/test/pg-config-e2e/Gamma.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/pg-config-e2e/Iota.java b/test/pg-config-e2e/Iota.java
index d1baa2eb839..571a5e391f5 100644
--- a/test/pg-config-e2e/Iota.java
+++ b/test/pg-config-e2e/Iota.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/pg-config-e2e/Omega.java b/test/pg-config-e2e/Omega.java
index 2f37663afb2..03e37400ebd 100644
--- a/test/pg-config-e2e/Omega.java
+++ b/test/pg-config-e2e/Omega.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/pg-config-e2e/ProguardTest.cpp b/test/pg-config-e2e/ProguardTest.cpp
index 36da0ddbf72..fead8e89374 100644
--- a/test/pg-config-e2e/ProguardTest.cpp
+++ b/test/pg-config-e2e/ProguardTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cstdint>
diff --git a/test/pg-config-e2e/ProguardTest.java b/test/pg-config-e2e/ProguardTest.java
index 21d7c6509f1..765af3b4317 100644
--- a/test/pg-config-e2e/ProguardTest.java
+++ b/test/pg-config-e2e/ProguardTest.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/pg-config-e2e/Theta.java b/test/pg-config-e2e/Theta.java
index 933e5bcaa88..0f6c051b9fa 100644
--- a/test/pg-config-e2e/Theta.java
+++ b/test/pg-config-e2e/Theta.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/pg-config-e2e/Zeta.java b/test/pg-config-e2e/Zeta.java
index bd18ccf0b34..df32952f465 100644
--- a/test/pg-config-e2e/Zeta.java
+++ b/test/pg-config-e2e/Zeta.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.proguard;
diff --git a/test/samples/counter/Counter.java b/test/samples/counter/Counter.java
index 4f4b4190345..28a66c8abe7 100644
--- a/test/samples/counter/Counter.java
+++ b/test/samples/counter/Counter.java
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.redex.test.counter;
diff --git a/test/unit/AliasedRegistersTest.cpp b/test/unit/AliasedRegistersTest.cpp
index 5c43007f0da..e8a0de13ebb 100644
--- a/test/unit/AliasedRegistersTest.cpp
+++ b/test/unit/AliasedRegistersTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/unit/ConcurrentContainersTest.cpp b/test/unit/ConcurrentContainersTest.cpp
index 6732177171c..2e0b884a4b3 100644
--- a/test/unit/ConcurrentContainersTest.cpp
+++ b/test/unit/ConcurrentContainersTest.cpp
@@ -1,11 +1,9 @@
 
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ConcurrentContainers.h"
diff --git a/test/unit/ControlFlowTest.cpp b/test/unit/ControlFlowTest.cpp
index 3c1c7b7194b..a60566dc42b 100644
--- a/test/unit/ControlFlowTest.cpp
+++ b/test/unit/ControlFlowTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gmock/gmock.h>
diff --git a/test/unit/CopyPropagationTest.cpp b/test/unit/CopyPropagationTest.cpp
index 120fd741b62..1ab983c3f15 100644
--- a/test/unit/CopyPropagationTest.cpp
+++ b/test/unit/CopyPropagationTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/unit/CreatorsTest.cpp b/test/unit/CreatorsTest.cpp
index a021d72e8d8..7eee7702650 100644
--- a/test/unit/CreatorsTest.cpp
+++ b/test/unit/CreatorsTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/unit/DebugInfoTest.cpp b/test/unit/DebugInfoTest.cpp
index 5b9f69d0339..2a10d0a1480 100644
--- a/test/unit/DebugInfoTest.cpp
+++ b/test/unit/DebugInfoTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/unit/DedupBlocksTest.cpp b/test/unit/DedupBlocksTest.cpp
index 019bf0dee8f..90766f90817 100644
--- a/test/unit/DedupBlocksTest.cpp
+++ b/test/unit/DedupBlocksTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/unit/DevirtualizerTest.cpp b/test/unit/DevirtualizerTest.cpp
index 3892c145114..18704129dfd 100644
--- a/test/unit/DevirtualizerTest.cpp
+++ b/test/unit/DevirtualizerTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <memory>
diff --git a/test/unit/DexMutateTest.cpp b/test/unit/DexMutateTest.cpp
index fe5eb8cbe6b..11814fb660c 100644
--- a/test/unit/DexMutateTest.cpp
+++ b/test/unit/DexMutateTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/unit/DexUnitTestRunner.h b/test/unit/DexUnitTestRunner.h
index 18e5e8831f4..51145bd849c 100644
--- a/test/unit/DexUnitTestRunner.h
+++ b/test/unit/DexUnitTestRunner.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/test/unit/EvArgTest.cpp b/test/unit/EvArgTest.cpp
index e6247b185f7..63bb8f88f93 100644
--- a/test/unit/EvArgTest.cpp
+++ b/test/unit/EvArgTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cstdint>
diff --git a/test/unit/EvWriteTest.cpp b/test/unit/EvWriteTest.cpp
index 28da8452f8a..322f6c9393b 100644
--- a/test/unit/EvWriteTest.cpp
+++ b/test/unit/EvWriteTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <algorithm>
diff --git a/test/unit/ExtractNativeTest.cpp b/test/unit/ExtractNativeTest.cpp
index 5a23501ddce..f345616b39a 100644
--- a/test/unit/ExtractNativeTest.cpp
+++ b/test/unit/ExtractNativeTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <string>
diff --git a/test/unit/FinalInlineTest.cpp b/test/unit/FinalInlineTest.cpp
index 8039326eb16..da033a1b3df 100644
--- a/test/unit/FinalInlineTest.cpp
+++ b/test/unit/FinalInlineTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <boost/any.hpp>
diff --git a/test/unit/FpEvTest.cpp b/test/unit/FpEvTest.cpp
index b699d57ebd8..57a152bf519 100644
--- a/test/unit/FpEvTest.cpp
+++ b/test/unit/FpEvTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cstdint>
diff --git a/test/unit/IRAssemblerTest.cpp b/test/unit/IRAssemblerTest.cpp
index da238885493..b56502229e6 100644
--- a/test/unit/IRAssemblerTest.cpp
+++ b/test/unit/IRAssemblerTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/unit/IRCodeTest.cpp b/test/unit/IRCodeTest.cpp
index 16635087f06..9a67dbf304c 100644
--- a/test/unit/IRCodeTest.cpp
+++ b/test/unit/IRCodeTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/unit/IRInstructionTest.cpp b/test/unit/IRInstructionTest.cpp
index 68a53bc7d01..256dcae2754 100644
--- a/test/unit/IRInstructionTest.cpp
+++ b/test/unit/IRInstructionTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/unit/IRTypeCheckerTest.cpp b/test/unit/IRTypeCheckerTest.cpp
index 5ebded42524..3ade18f3b55 100644
--- a/test/unit/IRTypeCheckerTest.cpp
+++ b/test/unit/IRTypeCheckerTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gmock/gmock.h>
diff --git a/test/unit/LiteralsTest.cpp b/test/unit/LiteralsTest.cpp
index 21aa979c1a7..242b450b631 100644
--- a/test/unit/LiteralsTest.cpp
+++ b/test/unit/LiteralsTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/unit/LocalDceTest.cpp b/test/unit/LocalDceTest.cpp
index a6d1c14faf8..94acf3a77c8 100644
--- a/test/unit/LocalDceTest.cpp
+++ b/test/unit/LocalDceTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/unit/LocalPointersTest.cpp b/test/unit/LocalPointersTest.cpp
index 914b5019f8d..40af154d8f4 100644
--- a/test/unit/LocalPointersTest.cpp
+++ b/test/unit/LocalPointersTest.cpp
@@ -1,11 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional
- * grant of patent rights can be found in the PATENTS file in the same
- * directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "LocalPointersAnalysis.h"
diff --git a/test/unit/Mutf8CompareTest.cpp b/test/unit/Mutf8CompareTest.cpp
index 56481fcbaa3..889534c7295 100644
--- a/test/unit/Mutf8CompareTest.cpp
+++ b/test/unit/Mutf8CompareTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <memory>
diff --git a/test/unit/OpcodeList.cpp b/test/unit/OpcodeList.cpp
index c590484ef3b..d169ff02995 100644
--- a/test/unit/OpcodeList.cpp
+++ b/test/unit/OpcodeList.cpp
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved. *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "OpcodeList.h"
diff --git a/test/unit/OpcodeList.h b/test/unit/OpcodeList.h
index 0a67d3b13aa..21ca6e7fa36 100644
--- a/test/unit/OpcodeList.h
+++ b/test/unit/OpcodeList.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/test/unit/ProguardLexerTest.cpp b/test/unit/ProguardLexerTest.cpp
index 5e071e612cd..e2d1c017fe3 100644
--- a/test/unit/ProguardLexerTest.cpp
+++ b/test/unit/ProguardLexerTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/unit/ProguardMapTest.cpp b/test/unit/ProguardMapTest.cpp
index 325deb77c3a..1cde267fc6b 100644
--- a/test/unit/ProguardMapTest.cpp
+++ b/test/unit/ProguardMapTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/unit/ProguardParserTest.cpp b/test/unit/ProguardParserTest.cpp
index 129a8134b11..d11d79a3c67 100644
--- a/test/unit/ProguardParserTest.cpp
+++ b/test/unit/ProguardParserTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/unit/ProguardRegexTest.cpp b/test/unit/ProguardRegexTest.cpp
index 0fb9629953e..d2b1a59aca0 100644
--- a/test/unit/ProguardRegexTest.cpp
+++ b/test/unit/ProguardRegexTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/unit/RedexResourcesTest.cpp b/test/unit/RedexResourcesTest.cpp
index 94c91d0bf4a..fbb8dcb4e59 100644
--- a/test/unit/RedexResourcesTest.cpp
+++ b/test/unit/RedexResourcesTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <map>
diff --git a/test/unit/RegAllocTest.cpp b/test/unit/RegAllocTest.cpp
index 372ed1ce00f..49d86fce507 100644
--- a/test/unit/RegAllocTest.cpp
+++ b/test/unit/RegAllocTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cmath>
diff --git a/test/unit/RegistersTest.cpp b/test/unit/RegistersTest.cpp
index a526da9068e..21c2fd027d6 100644
--- a/test/unit/RegistersTest.cpp
+++ b/test/unit/RegistersTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/unit/RemoveGotosTest.cpp b/test/unit/RemoveGotosTest.cpp
index 68c7e79c42c..40b4bfcf87a 100644
--- a/test/unit/RemoveGotosTest.cpp
+++ b/test/unit/RemoveGotosTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/unit/RenamerTest.cpp b/test/unit/RenamerTest.cpp
index e393cf6a508..15bd0fa6e09 100644
--- a/test/unit/RenamerTest.cpp
+++ b/test/unit/RenamerTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <memory>
diff --git a/test/unit/ResolverTest.cpp b/test/unit/ResolverTest.cpp
index 6433faf6fc8..d56ba344600 100644
--- a/test/unit/ResolverTest.cpp
+++ b/test/unit/ResolverTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <memory>
diff --git a/test/unit/ResourceSerializationTest.cpp b/test/unit/ResourceSerializationTest.cpp
index 691832ddc69..7623f90539b 100644
--- a/test/unit/ResourceSerializationTest.cpp
+++ b/test/unit/ResourceSerializationTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <array>
diff --git a/test/unit/ScopeHelper.cpp b/test/unit/ScopeHelper.cpp
index 4d5431ca5a3..be34c34b7dd 100644
--- a/test/unit/ScopeHelper.cpp
+++ b/test/unit/ScopeHelper.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ScopeHelper.h"
diff --git a/test/unit/ScopeHelper.h b/test/unit/ScopeHelper.h
index 3d924af5f6d..3ecb1f28196 100644
--- a/test/unit/ScopeHelper.h
+++ b/test/unit/ScopeHelper.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/test/unit/SimpleInlineTest.cpp b/test/unit/SimpleInlineTest.cpp
index 25df7a3b41e..5240a5e497a 100644
--- a/test/unit/SimpleInlineTest.cpp
+++ b/test/unit/SimpleInlineTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/unit/StringSimplificationTest.cpp b/test/unit/StringSimplificationTest.cpp
index 34453500e44..b970ba4db36 100644
--- a/test/unit/StringSimplificationTest.cpp
+++ b/test/unit/StringSimplificationTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/unit/TraceMultithreadingTest.cpp b/test/unit/TraceMultithreadingTest.cpp
index 515c3f0ba39..43380b42a03 100644
--- a/test/unit/TraceMultithreadingTest.cpp
+++ b/test/unit/TraceMultithreadingTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <gtest/gtest.h>
diff --git a/test/unit/TypeSystemTest.cpp b/test/unit/TypeSystemTest.cpp
index 625a710c164..d108ec9a85d 100644
--- a/test/unit/TypeSystemTest.cpp
+++ b/test/unit/TypeSystemTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <memory>
diff --git a/test/unit/VirtScopeHelper.cpp b/test/unit/VirtScopeHelper.cpp
index 08276e9e015..636339f0394 100644
--- a/test/unit/VirtScopeHelper.cpp
+++ b/test/unit/VirtScopeHelper.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <memory>
diff --git a/test/unit/VirtScopeHelper.h b/test/unit/VirtScopeHelper.h
index c6c2a8e39c6..39731b5e6bb 100644
--- a/test/unit/VirtScopeHelper.h
+++ b/test/unit/VirtScopeHelper.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/test/unit/VirtScopeTest.cpp b/test/unit/VirtScopeTest.cpp
index 70dc87dfda6..e01c6a6c3ba 100644
--- a/test/unit/VirtScopeTest.cpp
+++ b/test/unit/VirtScopeTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <memory>
diff --git a/test/unit/WorkQueuePerfTest.cpp b/test/unit/WorkQueuePerfTest.cpp
index 8a4189ab4b8..2969d037dd7 100644
--- a/test/unit/WorkQueuePerfTest.cpp
+++ b/test/unit/WorkQueuePerfTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "WorkQueue.h"
diff --git a/test/unit/WorkQueueTest.cpp b/test/unit/WorkQueueTest.cpp
index a74b98e9fdc..3829f55e9aa 100644
--- a/test/unit/WorkQueueTest.cpp
+++ b/test/unit/WorkQueueTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "WorkQueue.h"
diff --git a/test/unit/constant-propagation/ArrayPropagationTest.cpp b/test/unit/constant-propagation/ArrayPropagationTest.cpp
index 21202b17b3a..686fba3d23a 100644
--- a/test/unit/constant-propagation/ArrayPropagationTest.cpp
+++ b/test/unit/constant-propagation/ArrayPropagationTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ConstantPropagation.h"
diff --git a/test/unit/constant-propagation/BoxedBooleanPropagationTest.cpp b/test/unit/constant-propagation/BoxedBooleanPropagationTest.cpp
index 252108bf627..7ccc354d96b 100644
--- a/test/unit/constant-propagation/BoxedBooleanPropagationTest.cpp
+++ b/test/unit/constant-propagation/BoxedBooleanPropagationTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ConstantPropagation.h"
diff --git a/test/unit/constant-propagation/ConstantPropagationTest.cpp b/test/unit/constant-propagation/ConstantPropagationTest.cpp
index 623f6af7fe3..129e1b1740d 100644
--- a/test/unit/constant-propagation/ConstantPropagationTest.cpp
+++ b/test/unit/constant-propagation/ConstantPropagationTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ConstantPropagation.h"
diff --git a/test/unit/constant-propagation/ConstantPropagationTestUtil.h b/test/unit/constant-propagation/ConstantPropagationTestUtil.h
index 92f3f3b7107..1a508e603af 100644
--- a/test/unit/constant-propagation/ConstantPropagationTestUtil.h
+++ b/test/unit/constant-propagation/ConstantPropagationTestUtil.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ConstantPropagation.h"
diff --git a/test/unit/constant-propagation/EnumPropagationTest.cpp b/test/unit/constant-propagation/EnumPropagationTest.cpp
index aa363b7c15a..5a65e693a34 100644
--- a/test/unit/constant-propagation/EnumPropagationTest.cpp
+++ b/test/unit/constant-propagation/EnumPropagationTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ConstantPropagation.h"
diff --git a/test/unit/constant-propagation/IPConstantPropagationTest.cpp b/test/unit/constant-propagation/IPConstantPropagationTest.cpp
index 1cd91c97765..ab568fd6b9a 100644
--- a/test/unit/constant-propagation/IPConstantPropagationTest.cpp
+++ b/test/unit/constant-propagation/IPConstantPropagationTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "IPConstantPropagation.h"
diff --git a/test/unit/constant-propagation/ObjectPropagationTest.cpp b/test/unit/constant-propagation/ObjectPropagationTest.cpp
index 359dd770f37..6e9fdee3778 100644
--- a/test/unit/constant-propagation/ObjectPropagationTest.cpp
+++ b/test/unit/constant-propagation/ObjectPropagationTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ConstantPropagation.h"
diff --git a/test/unit/constant-propagation/SignedConstantPropagationTest.cpp b/test/unit/constant-propagation/SignedConstantPropagationTest.cpp
index 64cb1412cd7..d4208c1e687 100644
--- a/test/unit/constant-propagation/SignedConstantPropagationTest.cpp
+++ b/test/unit/constant-propagation/SignedConstantPropagationTest.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ConstantPropagation.h"
diff --git a/test/unit/dead-code-elimination/SideEffectSummaryTest.cpp b/test/unit/dead-code-elimination/SideEffectSummaryTest.cpp
index 87a58e76a4b..b23f7fec148 100644
--- a/test/unit/dead-code-elimination/SideEffectSummaryTest.cpp
+++ b/test/unit/dead-code-elimination/SideEffectSummaryTest.cpp
@@ -1,11 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional
- * grant of patent rights can be found in the PATENTS file in the same
- * directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "SideEffectSummary.h"
diff --git a/test/unit/dead-code-elimination/UsedVarsTest.cpp b/test/unit/dead-code-elimination/UsedVarsTest.cpp
index ba1b1cbf4ec..ff3a43232d1 100644
--- a/test/unit/dead-code-elimination/UsedVarsTest.cpp
+++ b/test/unit/dead-code-elimination/UsedVarsTest.cpp
@@ -1,11 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional
- * grant of patent rights can be found in the PATENTS file in the same
- * directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "UsedVarsAnalysis.h"
diff --git a/tools/common/DexCommon.cpp b/tools/common/DexCommon.cpp
index 8156bd17872..706932aafe5 100644
--- a/tools/common/DexCommon.cpp
+++ b/tools/common/DexCommon.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "DexCommon.h"
diff --git a/tools/common/DexCommon.h b/tools/common/DexCommon.h
index 469aac18189..07bd1df4d3a 100644
--- a/tools/common/DexCommon.h
+++ b/tools/common/DexCommon.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/tools/common/Formatters.cpp b/tools/common/Formatters.cpp
index b63862ed991..9a99da3f505 100644
--- a/tools/common/Formatters.cpp
+++ b/tools/common/Formatters.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Formatters.h"
diff --git a/tools/common/Formatters.h b/tools/common/Formatters.h
index 9654c4bb897..39a34d60b90 100644
--- a/tools/common/Formatters.h
+++ b/tools/common/Formatters.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/tools/debug-info/PositionMap.cpp b/tools/debug-info/PositionMap.cpp
index b250b3ade78..caa772e3a7b 100644
--- a/tools/debug-info/PositionMap.cpp
+++ b/tools/debug-info/PositionMap.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <boost/scope_exit.hpp>
diff --git a/tools/debug-info/PositionMap.h b/tools/debug-info/PositionMap.h
index 2eeb5ed9867..43f3df03f70 100644
--- a/tools/debug-info/PositionMap.h
+++ b/tools/debug-info/PositionMap.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <memory>
diff --git a/tools/debug-info/linemapdump.cpp b/tools/debug-info/linemapdump.cpp
index 08f41ba9b99..5d79f438d53 100644
--- a/tools/debug-info/linemapdump.cpp
+++ b/tools/debug-info/linemapdump.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <iostream>
diff --git a/tools/debug-info/symbolicate-trace.cpp b/tools/debug-info/symbolicate-trace.cpp
index 6c85d902cee..128124d0acd 100644
--- a/tools/debug-info/symbolicate-trace.cpp
+++ b/tools/debug-info/symbolicate-trace.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <boost/regex.hpp>
diff --git a/tools/dexgrep/DexGrep.cpp b/tools/dexgrep/DexGrep.cpp
index a62dc5ade87..ebc6d2538ef 100644
--- a/tools/dexgrep/DexGrep.cpp
+++ b/tools/dexgrep/DexGrep.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cstdio>
diff --git a/tools/hprof/dump_classes_from_hprof.py b/tools/hprof/dump_classes_from_hprof.py
index d208220ad26..67665304c14 100644
--- a/tools/hprof/dump_classes_from_hprof.py
+++ b/tools/hprof/dump_classes_from_hprof.py
@@ -1,9 +1,7 @@
-# Copyright (c) 2016-present, Facebook, Inc.
-# All rights reserved.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 # Parses Android hprof dumps.
 # Example usage:
diff --git a/tools/oatmeal/OatmealUtil.cpp b/tools/oatmeal/OatmealUtil.cpp
index 1d3b274f1dd..ff15d9c3265 100644
--- a/tools/oatmeal/OatmealUtil.cpp
+++ b/tools/oatmeal/OatmealUtil.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "OatmealUtil.h"
diff --git a/tools/oatmeal/OatmealUtil.h b/tools/oatmeal/OatmealUtil.h
index b4d348a4987..d2f59a87278 100644
--- a/tools/oatmeal/OatmealUtil.h
+++ b/tools/oatmeal/OatmealUtil.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/tools/oatmeal/dex.cpp b/tools/oatmeal/dex.cpp
index 1a3b28502dc..16952c6ad9b 100644
--- a/tools/oatmeal/dex.cpp
+++ b/tools/oatmeal/dex.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "dex.h"
diff --git a/tools/oatmeal/dex.h b/tools/oatmeal/dex.h
index 772e4852c70..f0b48f6189e 100644
--- a/tools/oatmeal/dex.h
+++ b/tools/oatmeal/dex.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/tools/oatmeal/dump-oat.cpp b/tools/oatmeal/dump-oat.cpp
index 4fdfba81349..1e0b4527f79 100644
--- a/tools/oatmeal/dump-oat.cpp
+++ b/tools/oatmeal/dump-oat.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // Code for parsing and building OAT files for multiple android versions. See
diff --git a/tools/oatmeal/dump-oat.h b/tools/oatmeal/dump-oat.h
index b050aed8af9..4fee623cd64 100644
--- a/tools/oatmeal/dump-oat.h
+++ b/tools/oatmeal/dump-oat.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/tools/oatmeal/elf-writer.cpp b/tools/oatmeal/elf-writer.cpp
index 6cca4406374..c129c5738ec 100644
--- a/tools/oatmeal/elf-writer.cpp
+++ b/tools/oatmeal/elf-writer.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "elf-writer.h"
diff --git a/tools/oatmeal/elf-writer.h b/tools/oatmeal/elf-writer.h
index db188e5c38f..7afb4b80557 100644
--- a/tools/oatmeal/elf-writer.h
+++ b/tools/oatmeal/elf-writer.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/tools/oatmeal/main.cpp b/tools/oatmeal/main.cpp
index 06215a89874..ef06ab45d99 100644
--- a/tools/oatmeal/main.cpp
+++ b/tools/oatmeal/main.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "dump-oat.h"
diff --git a/tools/oatmeal/memory-accounter.cpp b/tools/oatmeal/memory-accounter.cpp
index dc4f0674a9f..c533668991d 100644
--- a/tools/oatmeal/memory-accounter.cpp
+++ b/tools/oatmeal/memory-accounter.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "memory-accounter.h"
diff --git a/tools/oatmeal/memory-accounter.h b/tools/oatmeal/memory-accounter.h
index a82f22c8978..6489d823ab7 100644
--- a/tools/oatmeal/memory-accounter.h
+++ b/tools/oatmeal/memory-accounter.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/tools/oatmeal/vdex.cpp b/tools/oatmeal/vdex.cpp
index 6d756af6645..c026247f334 100644
--- a/tools/oatmeal/vdex.cpp
+++ b/tools/oatmeal/vdex.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "vdex.h"
diff --git a/tools/oatmeal/vdex.h b/tools/oatmeal/vdex.h
index 80cfb537cdc..19669b00534 100644
--- a/tools/oatmeal/vdex.h
+++ b/tools/oatmeal/vdex.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/tools/python/dex.py b/tools/python/dex.py
index b0ec3e47025..7900bdd57c5 100755
--- a/tools/python/dex.py
+++ b/tools/python/dex.py
@@ -1,11 +1,9 @@
 #!/usr/bin/env python
 
-# Copyright (c) 2016-present, Facebook, Inc.
-# All rights reserved.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 
 from __future__ import absolute_import
diff --git a/tools/python/dict_utils.py b/tools/python/dict_utils.py
index 927ce15eb61..8b292ea8f17 100755
--- a/tools/python/dict_utils.py
+++ b/tools/python/dict_utils.py
@@ -1,11 +1,9 @@
 #! /usr/bin/env python
 
-# Copyright (c) 2016-present, Facebook, Inc.
-# All rights reserved.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 
 from __future__ import absolute_import
diff --git a/tools/python/file_extract.py b/tools/python/file_extract.py
index ed26cdcd332..36efcc11449 100755
--- a/tools/python/file_extract.py
+++ b/tools/python/file_extract.py
@@ -1,11 +1,9 @@
 #! /usr/bin/env python
 
-# Copyright (c) 2016-present, Facebook, Inc.
-# All rights reserved.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 from __future__ import absolute_import
 from __future__ import division
diff --git a/tools/python/reach_graph.py b/tools/python/reach_graph.py
index f53d6d2cc4c..df1b257a004 100755
--- a/tools/python/reach_graph.py
+++ b/tools/python/reach_graph.py
@@ -1,11 +1,9 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2016-present, Facebook, Inc.
-# All rights reserved.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 from __future__ import absolute_import
 from __future__ import division
diff --git a/tools/redex-all/CommentFilter.h b/tools/redex-all/CommentFilter.h
index 86c707ca513..4193340abce 100644
--- a/tools/redex-all/CommentFilter.h
+++ b/tools/redex-all/CommentFilter.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/tools/redex-all/main.cpp b/tools/redex-all/main.cpp
index a007b746d1f..133e09d5670 100644
--- a/tools/redex-all/main.cpp
+++ b/tools/redex-all/main.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cstring>
diff --git a/tools/redex-tool/AnalyzeThrows.cpp b/tools/redex-tool/AnalyzeThrows.cpp
index 656299bed33..bf8a1350fb2 100644
--- a/tools/redex-tool/AnalyzeThrows.cpp
+++ b/tools/redex-tool/AnalyzeThrows.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <queue>
diff --git a/tools/redex-tool/DexSqlDump.cpp b/tools/redex-tool/DexSqlDump.cpp
index 13805f2c9d5..cff16f053ff 100644
--- a/tools/redex-tool/DexSqlDump.cpp
+++ b/tools/redex-tool/DexSqlDump.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
  /*
diff --git a/tools/redex-tool/DexSqlQuery.py b/tools/redex-tool/DexSqlQuery.py
index b75b4460464..58f808fe5ed 100755
--- a/tools/redex-tool/DexSqlQuery.py
+++ b/tools/redex-tool/DexSqlQuery.py
@@ -1,11 +1,9 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2016-present, Facebook, Inc.
-# All rights reserved.
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 from __future__ import absolute_import
 from __future__ import division
diff --git a/tools/redex-tool/DiffMethodSizes.cpp b/tools/redex-tool/DiffMethodSizes.cpp
index cdc0abdb142..01d04da01b7 100644
--- a/tools/redex-tool/DiffMethodSizes.cpp
+++ b/tools/redex-tool/DiffMethodSizes.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "DexClass.h"
diff --git a/tools/redex-tool/NativeOutlinerCodegen.cpp b/tools/redex-tool/NativeOutlinerCodegen.cpp
index 62f99d47691..2ff57e7b0af 100644
--- a/tools/redex-tool/NativeOutlinerCodegen.cpp
+++ b/tools/redex-tool/NativeOutlinerCodegen.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Show.h"
@@ -30,7 +28,7 @@ namespace {
 
 constexpr static char kOutlineThrowsTemplate[] = R"template(
 
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) Facebook, Inc. and its affiliates.
 
 #include <fb/fbjni.h>
 
diff --git a/tools/redex-tool/RedexTool.cpp b/tools/redex-tool/RedexTool.cpp
index 1b0c93ca7c5..47de40974cb 100644
--- a/tools/redex-tool/RedexTool.cpp
+++ b/tools/redex-tool/RedexTool.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <stdlib.h>
diff --git a/tools/redex-tool/RedexTool.h b/tools/redex-tool/RedexTool.h
index 2a7c15a2db5..5e3de0cf4b0 100644
--- a/tools/redex-tool/RedexTool.h
+++ b/tools/redex-tool/RedexTool.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/tools/redex-tool/Verifier.cpp b/tools/redex-tool/Verifier.cpp
index eb8f04a3ed3..c9277fb0f94 100644
--- a/tools/redex-tool/Verifier.cpp
+++ b/tools/redex-tool/Verifier.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Tool.h"
diff --git a/tools/redex-tool/VizMflow.cpp b/tools/redex-tool/VizMflow.cpp
index cea80f3099c..a333021096d 100644
--- a/tools/redex-tool/VizMflow.cpp
+++ b/tools/redex-tool/VizMflow.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <queue>
diff --git a/tools/redexdump/DumpTables.cpp b/tools/redexdump/DumpTables.cpp
index 8cc3177006e..4a37141e9b3 100644
--- a/tools/redexdump/DumpTables.cpp
+++ b/tools/redexdump/DumpTables.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "DexDebugInstruction.h"
diff --git a/tools/redexdump/PrintUtil.cpp b/tools/redexdump/PrintUtil.cpp
index c53445327f7..d9742a3f1c7 100644
--- a/tools/redexdump/PrintUtil.cpp
+++ b/tools/redexdump/PrintUtil.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "PrintUtil.h"
diff --git a/tools/redexdump/PrintUtil.h b/tools/redexdump/PrintUtil.h
index 7da8de09470..b06d46e499a 100644
--- a/tools/redexdump/PrintUtil.h
+++ b/tools/redexdump/PrintUtil.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/tools/redexdump/RedexDump.cpp b/tools/redexdump/RedexDump.cpp
index 04f235188c1..b3215d6eeb1 100644
--- a/tools/redexdump/RedexDump.cpp
+++ b/tools/redexdump/RedexDump.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RedexDump.h"
diff --git a/tools/redexdump/RedexDump.h b/tools/redexdump/RedexDump.h
index d404d4d9c08..da6949f1457 100644
--- a/tools/redexdump/RedexDump.h
+++ b/tools/redexdump/RedexDump.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/tools/tool/Tool.cpp b/tools/tool/Tool.cpp
index 46bce6b4562..83038c9af84 100644
--- a/tools/tool/Tool.cpp
+++ b/tools/tool/Tool.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <boost/algorithm/string.hpp>
diff --git a/tools/tool/Tool.h b/tools/tool/Tool.h
index 77f06118074..5dd7140fe01 100644
--- a/tools/tool/Tool.h
+++ b/tools/tool/Tool.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/tools/tool/ToolRegistry.cpp b/tools/tool/ToolRegistry.cpp
index fb1c2ab4ab3..9d0969925f9 100644
--- a/tools/tool/ToolRegistry.cpp
+++ b/tools/tool/ToolRegistry.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "ToolRegistry.h"
diff --git a/tools/tool/ToolRegistry.h b/tools/tool/ToolRegistry.h
index 01b14479fb8..00deebfec97 100644
--- a/tools/tool/ToolRegistry.h
+++ b/tools/tool/ToolRegistry.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/tools/tool/ToolUtil.h b/tools/tool/ToolUtil.h
index cfd1c0fa792..3cc68fd54f1 100644
--- a/tools/tool/ToolUtil.h
+++ b/tools/tool/ToolUtil.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <iostream>
diff --git a/util/MallocDebug.cpp b/util/MallocDebug.cpp
index 1c86336ccc1..cc984810c63 100644
--- a/util/MallocDebug.cpp
+++ b/util/MallocDebug.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/util/Sha1.cpp b/util/Sha1.cpp
index 1478b40a8bd..87a77724e2b 100644
--- a/util/Sha1.cpp
+++ b/util/Sha1.cpp
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /*
diff --git a/util/Sha1.h b/util/Sha1.h
index c7529346b43..cec13cc5879 100644
--- a/util/Sha1.h
+++ b/util/Sha1.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/util/StringUtil.h b/util/StringUtil.h
index 303fd3a7dd1..4adc6798a67 100644
--- a/util/StringUtil.h
+++ b/util/StringUtil.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/util/TemplateUtil.h b/util/TemplateUtil.h
index d9bd36508bf..984fcf06b1b 100644
--- a/util/TemplateUtil.h
+++ b/util/TemplateUtil.h
@@ -1,10 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once