diff --git a/LICENSE-APACHE b/LICENSE-APACHE
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/LICENSE-APACHE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/LICENSE-BSD-3-Clause b/LICENSE-BSD-3-Clause
new file mode 100644
index 000000000..8bafca303
--- /dev/null
+++ b/LICENSE-BSD-3-Clause
@@ -0,0 +1,27 @@
+// Copyright 2017 The Chromium OS Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * 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 of Google Inc. 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
+// OWNER 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.
diff --git a/arch/src/x86_64/gdt.rs b/arch/src/x86_64/gdt.rs
index b13c8b1fe..97737bf4a 100644
--- a/arch/src/x86_64/gdt.rs
+++ b/arch/src/x86_64/gdt.rs
@@ -3,7 +3,7 @@
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the THIRD-PARTY file.
+// found in the LICENSE-BSD-3-Clause file.
 
 // For GDT details see arch/x86/include/asm/segment.h
 
diff --git a/arch/src/x86_64/interrupts.rs b/arch/src/x86_64/interrupts.rs
index dcd53c044..7a504800c 100644
--- a/arch/src/x86_64/interrupts.rs
+++ b/arch/src/x86_64/interrupts.rs
@@ -3,7 +3,7 @@
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the THIRD-PARTY file.
+// found in the LICENSE-BSD-3-Clause file.
 
 use std::io::{self, Cursor};
 use std::mem;
diff --git a/arch/src/x86_64/layout.rs b/arch/src/x86_64/layout.rs
index c01b4729d..d0703ec75 100644
--- a/arch/src/x86_64/layout.rs
+++ b/arch/src/x86_64/layout.rs
@@ -3,7 +3,7 @@
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the THIRD-PARTY file.
+// found in the LICENSE-BSD-3-Clause file.
 
 use vm_memory::GuestAddress;
 
diff --git a/arch/src/x86_64/mod.rs b/arch/src/x86_64/mod.rs
index 58ccf5cc4..65223de62 100644
--- a/arch/src/x86_64/mod.rs
+++ b/arch/src/x86_64/mod.rs
@@ -3,7 +3,7 @@
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the THIRD-PARTY file.
+// found in the LICENSE-BSD-3-Clause file.
 
 mod gdt;
 pub mod interrupts;
diff --git a/arch/src/x86_64/mptable.rs b/arch/src/x86_64/mptable.rs
index 5ffd1df53..50b7b1dce 100644
--- a/arch/src/x86_64/mptable.rs
+++ b/arch/src/x86_64/mptable.rs
@@ -3,7 +3,7 @@
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the THIRD-PARTY file.
+// found in the LICENSE-BSD-3-Clause file.
 
 use std::io;
 use std::mem;
diff --git a/arch/src/x86_64/regs.rs b/arch/src/x86_64/regs.rs
index 2d3964bf0..e39fe22f5 100644
--- a/arch/src/x86_64/regs.rs
+++ b/arch/src/x86_64/regs.rs
@@ -3,7 +3,7 @@
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the THIRD-PARTY file.
+// found in the LICENSE-BSD-3-Clause file.
 
 use std::{io, mem, result};
 
diff --git a/arch_gen/src/x86/bootparam.rs b/arch_gen/src/x86/bootparam.rs
index 62b95c5ee..de227f463 100644
--- a/arch_gen/src/x86/bootparam.rs
+++ b/arch_gen/src/x86/bootparam.rs
@@ -3,7 +3,7 @@
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the THIRD-PARTY file.
+// found in the LICENSE-BSD-3-Clause file.
 
 /*
  * automatically generated by rust-bindgen
diff --git a/arch_gen/src/x86/mod.rs b/arch_gen/src/x86/mod.rs
index 60a57f6d0..ee0b10ac3 100644
--- a/arch_gen/src/x86/mod.rs
+++ b/arch_gen/src/x86/mod.rs
@@ -3,7 +3,7 @@
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the THIRD-PARTY file.
+// found in the LICENSE-BSD-3-Clause file.
 
 #[allow(non_upper_case_globals)]
 #[allow(non_camel_case_types)]
diff --git a/arch_gen/src/x86/mpspec.rs b/arch_gen/src/x86/mpspec.rs
index cf709e235..dba2d74c6 100644
--- a/arch_gen/src/x86/mpspec.rs
+++ b/arch_gen/src/x86/mpspec.rs
@@ -1,6 +1,6 @@
 // Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the THIRD-PARTY file.
+// found in the LICENSE-BSD-3-Clause file.
 
 /* automatically generated by rust-bindgen */
 
diff --git a/arch_gen/src/x86/msr_index.rs b/arch_gen/src/x86/msr_index.rs
index 4b51f0862..81a7b06a0 100644
--- a/arch_gen/src/x86/msr_index.rs
+++ b/arch_gen/src/x86/msr_index.rs
@@ -1,6 +1,6 @@
 // Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the THIRD-PARTY file.
+// found in the LICENSE-BSD-3-Clause file.
 
 /*
  * automatically generated by rust-bindgen
diff --git a/devices/src/bus.rs b/devices/src/bus.rs
index bc5047049..0d544bafc 100644
--- a/devices/src/bus.rs
+++ b/devices/src/bus.rs
@@ -3,7 +3,7 @@
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the THIRD-PARTY file.
+// found in the LICENSE-BSD-3-Clause file.
 
 //! Handles routing to devices in an address space.
 
diff --git a/devices/src/legacy/i8042.rs b/devices/src/legacy/i8042.rs
index 68a12faff..c3121e80c 100644
--- a/devices/src/legacy/i8042.rs
+++ b/devices/src/legacy/i8042.rs
@@ -1,6 +1,6 @@
 // Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-BSD-3-Clause file.
 
 use vmm_sys_util::EventFd;
 
diff --git a/devices/src/legacy/mod.rs b/devices/src/legacy/mod.rs
index 7e0f571d1..b01b9ebf3 100644
--- a/devices/src/legacy/mod.rs
+++ b/devices/src/legacy/mod.rs
@@ -3,7 +3,7 @@
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the THIRD-PARTY file.
+// found in the LICENSE-BSD-3-Clause file.
 
 mod serial;
 mod i8042;
diff --git a/devices/src/legacy/serial.rs b/devices/src/legacy/serial.rs
index 2d7a26827..61ddab8ef 100644
--- a/devices/src/legacy/serial.rs
+++ b/devices/src/legacy/serial.rs
@@ -3,7 +3,7 @@
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the THIRD-PARTY file.
+// found in the LICENSE-BSD-3-Clause file.
 
 use std::collections::VecDeque;
 use std::{io, result};
diff --git a/devices/src/lib.rs b/devices/src/lib.rs
index 9e1f976ff..9f5ffcf7e 100644
--- a/devices/src/lib.rs
+++ b/devices/src/lib.rs
@@ -3,7 +3,7 @@
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the THIRD-PARTY file.
+// found in the LICENSE-BSD-3-Clause file.
 
 //! Emulates virtual and hardware devices.
 extern crate byteorder;
diff --git a/pci/src/configuration.rs b/pci/src/configuration.rs
index 17b3519df..1af137dc4 100755
--- a/pci/src/configuration.rs
+++ b/pci/src/configuration.rs
@@ -1,6 +1,6 @@
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-BSD-3-Clause file.
 
 use crate::PciInterruptPin;
 use byteorder::{ByteOrder, LittleEndian};
diff --git a/pci/src/device.rs b/pci/src/device.rs
index 53868ad3d..f32db4d55 100755
--- a/pci/src/device.rs
+++ b/pci/src/device.rs
@@ -1,6 +1,6 @@
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-BSD-3-Clause file.
 
 use crate::configuration::{self, PciConfiguration};
 use crate::PciInterruptPin;
diff --git a/pci/src/lib.rs b/pci/src/lib.rs
index 11bcd6603..d90b11b7d 100644
--- a/pci/src/lib.rs
+++ b/pci/src/lib.rs
@@ -1,6 +1,6 @@
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-BSD-3-Clause file.
 
 //! Implements pci devices and busses.
 #[macro_use]
diff --git a/pci/src/root.rs b/pci/src/root.rs
index ee6bbf3e4..1468f6757 100755
--- a/pci/src/root.rs
+++ b/pci/src/root.rs
@@ -1,6 +1,6 @@
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-BSD-3-Clause file.
 
 use crate::configuration::{PciBridgeSubclass, PciClassCode, PciConfiguration, PciHeaderType};
 use crate::device::Error as PciDeviceError;
diff --git a/qcow/src/qcow.rs b/qcow/src/qcow.rs
index aa2388cb2..084b87070 100755
--- a/qcow/src/qcow.rs
+++ b/qcow/src/qcow.rs
@@ -1,6 +1,6 @@
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-BSD-3-Clause file.
 
 #[macro_use]
 extern crate log;
diff --git a/qcow/src/qcow_raw_file.rs b/qcow/src/qcow_raw_file.rs
index 456b9869e..eaef14bf1 100644
--- a/qcow/src/qcow_raw_file.rs
+++ b/qcow/src/qcow_raw_file.rs
@@ -1,6 +1,6 @@
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-BSD-3-Clause file.
 
 use std::fs::File;
 use std::io::{self, BufWriter, Seek, SeekFrom};
diff --git a/qcow/src/refcount.rs b/qcow/src/refcount.rs
index 3b87e91fa..1c82f72af 100644
--- a/qcow/src/refcount.rs
+++ b/qcow/src/refcount.rs
@@ -1,6 +1,6 @@
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-BSD-3-Clause file.
 
 use std;
 use std::fmt::{self, Display};
diff --git a/qcow/src/vec_cache.rs b/qcow/src/vec_cache.rs
index 7d8f9cece..668f2c71a 100644
--- a/qcow/src/vec_cache.rs
+++ b/qcow/src/vec_cache.rs
@@ -1,6 +1,6 @@
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-BSD-3-Clause file.
 
 use std::collections::hash_map::IterMut;
 use std::collections::HashMap;
diff --git a/virtio-bindings/src/lib.rs b/virtio-bindings/src/lib.rs
index 8380207f1..db5328666 100644
--- a/virtio-bindings/src/lib.rs
+++ b/virtio-bindings/src/lib.rs
@@ -3,7 +3,7 @@
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the THIRD-PARTY file.
+// found in the LICENSE-BSD-3-Clause file.
 
 #![allow(clippy::all)]
 #![allow(non_upper_case_globals)]
diff --git a/vm-allocator/src/address.rs b/vm-allocator/src/address.rs
index a343183a3..f0d1f01df 100644
--- a/vm-allocator/src/address.rs
+++ b/vm-allocator/src/address.rs
@@ -1,10 +1,11 @@
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 // Copyright © 2019 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0 OR MIT
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the THIRD-PARTY file.
+// found in the LICENSE-BSD-3-Clause file.
+//
+// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause
 
 use std::collections::btree_map::BTreeMap;
 use std::result;
diff --git a/vm-allocator/src/lib.rs b/vm-allocator/src/lib.rs
index d90161efc..a891efcb4 100644
--- a/vm-allocator/src/lib.rs
+++ b/vm-allocator/src/lib.rs
@@ -1,10 +1,11 @@
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 // Copyright © 2019 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0 OR MIT
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the THIRD-PARTY file.
+// found in the LICENSE-BSD-3-Clause file.
+//
+// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause
 
 //! Manages system resources that can be allocated to VMs and their devices.
 
diff --git a/vm-allocator/src/system.rs b/vm-allocator/src/system.rs
index b9a103df3..e074957ea 100755
--- a/vm-allocator/src/system.rs
+++ b/vm-allocator/src/system.rs
@@ -1,10 +1,11 @@
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 // Copyright © 2019 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0 OR MIT
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the THIRD-PARTY file.
+// found in the LICENSE-BSD-3-Clause file.
+//
+// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause
 
 use vm_memory::{GuestAddress, GuestUsize};
 
diff --git a/vm-virtio/src/block.rs b/vm-virtio/src/block.rs
index 8f8a826af..df864266a 100644
--- a/vm-virtio/src/block.rs
+++ b/vm-virtio/src/block.rs
@@ -1,9 +1,12 @@
 // Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the THIRD-PARTY file.
+// found in the LICENSE-BSD-3-Clause file.
+//
+// Copyright © 2019 Intel Corporation
+//
+// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause
 
 use epoll;
 use libc::EFD_NONBLOCK;
diff --git a/vm-virtio/src/device.rs b/vm-virtio/src/device.rs
index 75a574364..52ca6a5ef 100644
--- a/vm-virtio/src/device.rs
+++ b/vm-virtio/src/device.rs
@@ -1,6 +1,10 @@
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-BSD-3-Clause file.
+//
+// Copyright © 2019 Intel Corporation
+//
+// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause
 
 use super::*;
 use pci::{PciBarConfiguration, PciCapability};
diff --git a/vm-virtio/src/lib.rs b/vm-virtio/src/lib.rs
index 201acbb89..fadb3616b 100644
--- a/vm-virtio/src/lib.rs
+++ b/vm-virtio/src/lib.rs
@@ -1,9 +1,12 @@
 // Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the THIRD-PARTY file.
+// found in the LICENSE-BSD-3-Clause file.
+//
+// Copyright © 2019 Intel Corporation
+//
+// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause
 
 //! Implements virtio devices, queues, and transport mechanisms.
 extern crate epoll;
diff --git a/vm-virtio/src/queue.rs b/vm-virtio/src/queue.rs
index 563accbc5..79bae7b20 100644
--- a/vm-virtio/src/queue.rs
+++ b/vm-virtio/src/queue.rs
@@ -1,9 +1,12 @@
 // Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
 //
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the THIRD-PARTY file.
+// found in the LICENSE-BSD-3-Clause file.
+//
+// Copyright © 2019 Intel Corporation
+//
+// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause
 
 use std::cmp::min;
 use std::num::Wrapping;
diff --git a/vm-virtio/src/transport/mod.rs b/vm-virtio/src/transport/mod.rs
index aa4aab243..0941be94a 100644
--- a/vm-virtio/src/transport/mod.rs
+++ b/vm-virtio/src/transport/mod.rs
@@ -1,4 +1,6 @@
-// Copyright (c) 2019 Intel
+// Copyright © 2019 Intel Corporation
+//
+// SPDX-License-Identifier: Apache-2.0
 
 mod pci_common_config;
 mod pci_device;
diff --git a/vm-virtio/src/transport/pci_common_config.rs b/vm-virtio/src/transport/pci_common_config.rs
index 8694a4bba..83807efbe 100644
--- a/vm-virtio/src/transport/pci_common_config.rs
+++ b/vm-virtio/src/transport/pci_common_config.rs
@@ -1,6 +1,10 @@
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-BSD-3-Clause file.
+//
+// Copyright © 2019 Intel Corporation
+//
+// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause
 extern crate byteorder;
 
 use byteorder::{ByteOrder, LittleEndian};
diff --git a/vm-virtio/src/transport/pci_device.rs b/vm-virtio/src/transport/pci_device.rs
index 64945b140..08e0f9e68 100755
--- a/vm-virtio/src/transport/pci_device.rs
+++ b/vm-virtio/src/transport/pci_device.rs
@@ -1,6 +1,10 @@
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE-BSD-3-Clause file.
+//
+// Copyright © 2019 Intel Corporation
+//
+// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause
 
 extern crate devices;
 extern crate pci;
diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs
index 04cb89e19..103404538 100755
--- a/vmm/src/vm.rs
+++ b/vmm/src/vm.rs
@@ -1,7 +1,13 @@
+// Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+//
+// Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE-BSD-3-Clause file.
+//
 // Copyright © 2019 Intel Corporation
 //
-// SPDX-License-Identifier: Apache-2.0
-//vm
+// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause
+//
 
 extern crate arch;
 extern crate devices;