13 files changed, 26 insertions, 26 deletions
diff --git a/mpm/lib/mykonos/ad937x_ctrl.cpp b/mpm/lib/mykonos/ad937x_ctrl.cpp
index 0e9e2ec00..65f516501 100644
--- a/mpm/lib/mykonos/ad937x_ctrl.cpp
+++ b/mpm/lib/mykonos/ad937x_ctrl.cpp
@@ -1,7 +1,7 @@
 //
-// Copyright 2017 Ettus Research, National Instruments Company
+// Copyright 2017 Ettus Research, a National Instruments Company
 //
-// SPDX-License-Identifier: GPL-3.0
+// SPDX-License-Identifier: GPL-3.0-or-later
 //
 
 #include "ad937x_device.hpp"
diff --git a/mpm/lib/mykonos/ad937x_device.cpp b/mpm/lib/mykonos/ad937x_device.cpp
index 9b48a80bf..c46f0ad89 100644
--- a/mpm/lib/mykonos/ad937x_device.cpp
+++ b/mpm/lib/mykonos/ad937x_device.cpp
@@ -1,7 +1,7 @@
 //
-// Copyright 2017 Ettus Research, National Instruments Company
+// Copyright 2017 Ettus Research, a National Instruments Company
 //
-// SPDX-License-Identifier: GPL-3.0
+// SPDX-License-Identifier: GPL-3.0-or-later
 //
 
 #include "ad937x_device.hpp"
diff --git a/mpm/lib/mykonos/ad937x_device.hpp b/mpm/lib/mykonos/ad937x_device.hpp
index 24a15ba69..55c6f0cad 100644
--- a/mpm/lib/mykonos/ad937x_device.hpp
+++ b/mpm/lib/mykonos/ad937x_device.hpp
@@ -1,7 +1,7 @@
 //
-// Copyright 2017-2018 Ettus Research, National Instruments Company
+// Copyright 2017-2018 Ettus Research, a National Instruments Company
 //
-// SPDX-License-Identifier: GPL-3.0
+// SPDX-License-Identifier: GPL-3.0-or-later
 //
 
 #pragma once
diff --git a/mpm/lib/mykonos/ad937x_device_types.hpp b/mpm/lib/mykonos/ad937x_device_types.hpp
index 4f54c51d4..e4330d278 100644
--- a/mpm/lib/mykonos/ad937x_device_types.hpp
+++ b/mpm/lib/mykonos/ad937x_device_types.hpp
@@ -1,7 +1,7 @@
 //
-// Copyright 2017 Ettus Research, National Instruments Company
+// Copyright 2017 Ettus Research, a National Instruments Company
 //
-// SPDX-License-Identifier: GPL-3.0
+// SPDX-License-Identifier: GPL-3.0-or-later
 //
 
 #pragma once
diff --git a/mpm/lib/mykonos/ad937x_spi_iface.cpp b/mpm/lib/mykonos/ad937x_spi_iface.cpp
index ddbf28113..d78f4951f 100644
--- a/mpm/lib/mykonos/ad937x_spi_iface.cpp
+++ b/mpm/lib/mykonos/ad937x_spi_iface.cpp
@@ -1,7 +1,7 @@
 //
-// Copyright 2017 Ettus Research, National Instruments Company
+// Copyright 2017 Ettus Research, a National Instruments Company
 //
-// SPDX-License-Identifier: GPL-3.0
+// SPDX-License-Identifier: GPL-3.0-or-later
 //
 
 #include <mpm/ad937x/ad937x_spi_iface.hpp>
diff --git a/mpm/lib/mykonos/adi_ctrl.cpp b/mpm/lib/mykonos/adi_ctrl.cpp
index c1d8b3d2e..5b2775ae0 100644
--- a/mpm/lib/mykonos/adi_ctrl.cpp
+++ b/mpm/lib/mykonos/adi_ctrl.cpp
@@ -1,7 +1,7 @@
 //
-// Copyright 2017 Ettus Research, National Instruments Company
+// Copyright 2017 Ettus Research, a National Instruments Company
 //
-// SPDX-License-Identifier: GPL-3.0
+// SPDX-License-Identifier: GPL-3.0-or-later
 //
 
 #include "adi/common.h"
diff --git a/mpm/lib/mykonos/config/ad937x_config_t.cpp b/mpm/lib/mykonos/config/ad937x_config_t.cpp
index b707400c8..9bebeafad 100644
--- a/mpm/lib/mykonos/config/ad937x_config_t.cpp
+++ b/mpm/lib/mykonos/config/ad937x_config_t.cpp
@@ -1,7 +1,7 @@
 //
-// Copyright 2017 Ettus Research, National Instruments Company
+// Copyright 2017 Ettus Research, a National Instruments Company
 //
-// SPDX-License-Identifier: GPL-3.0
+// SPDX-License-Identifier: GPL-3.0-or-later
 //
 
 #include "ad937x_config_t.hpp"
diff --git a/mpm/lib/mykonos/config/ad937x_config_t.hpp b/mpm/lib/mykonos/config/ad937x_config_t.hpp
index 93b08a1df..7cbabb9b5 100644
--- a/mpm/lib/mykonos/config/ad937x_config_t.hpp
+++ b/mpm/lib/mykonos/config/ad937x_config_t.hpp
@@ -1,7 +1,7 @@
 //
-// Copyright 2017 Ettus Research, National Instruments Company
+// Copyright 2017 Ettus Research, a National Instruments Company
 //
-// SPDX-License-Identifier: GPL-3.0
+// SPDX-License-Identifier: GPL-3.0-or-later
 //
 
 #pragma once
diff --git a/mpm/lib/mykonos/config/ad937x_default_config.hpp b/mpm/lib/mykonos/config/ad937x_default_config.hpp
index 85e729af5..e01c0c6d3 100644
--- a/mpm/lib/mykonos/config/ad937x_default_config.hpp
+++ b/mpm/lib/mykonos/config/ad937x_default_config.hpp
@@ -1,7 +1,7 @@
 //
-// Copyright 2017 Ettus Research, National Instruments Company
+// Copyright 2017 Ettus Research, a National Instruments Company
 //
-// SPDX-License-Identifier: GPL-3.0
+// SPDX-License-Identifier: GPL-3.0-or-later
 //
 
 #include "../adi/t_mykonos.h"
diff --git a/mpm/lib/mykonos/config/ad937x_fir.cpp b/mpm/lib/mykonos/config/ad937x_fir.cpp
index 07358595e..01c8772eb 100644
--- a/mpm/lib/mykonos/config/ad937x_fir.cpp
+++ b/mpm/lib/mykonos/config/ad937x_fir.cpp
@@ -1,7 +1,7 @@
 //
-// Copyright 2017 Ettus Research, National Instruments Company
+// Copyright 2017 Ettus Research, a National Instruments Company
 //
-// SPDX-License-Identifier: GPL-3.0
+// SPDX-License-Identifier: GPL-3.0-or-later
 //
 
 #include "ad937x_fir.hpp"
diff --git a/mpm/lib/mykonos/config/ad937x_fir.hpp b/mpm/lib/mykonos/config/ad937x_fir.hpp
index 740d5cfe6..c3fda6fb7 100644
--- a/mpm/lib/mykonos/config/ad937x_fir.hpp
+++ b/mpm/lib/mykonos/config/ad937x_fir.hpp
@@ -1,7 +1,7 @@
 //
-// Copyright 2017 Ettus Research, National Instruments Company
+// Copyright 2017 Ettus Research, a National Instruments Company
 //
-// SPDX-License-Identifier: GPL-3.0
+// SPDX-License-Identifier: GPL-3.0-or-later
 //
 
 #pragma once
diff --git a/mpm/lib/mykonos/config/ad937x_gain_ctrl_config.cpp b/mpm/lib/mykonos/config/ad937x_gain_ctrl_config.cpp
index 44c5f1e32..d4fbef0ad 100644
--- a/mpm/lib/mykonos/config/ad937x_gain_ctrl_config.cpp
+++ b/mpm/lib/mykonos/config/ad937x_gain_ctrl_config.cpp
@@ -1,7 +1,7 @@
 //
-// Copyright 2017 Ettus Research, National Instruments Company
+// Copyright 2017 Ettus Research, a National Instruments Company
 //
-// SPDX-License-Identifier: GPL-3.0
+// SPDX-License-Identifier: GPL-3.0-or-later
 //
 
 #include "ad937x_gain_ctrl_config.hpp"
diff --git a/mpm/lib/mykonos/config/ad937x_gain_ctrl_config.hpp b/mpm/lib/mykonos/config/ad937x_gain_ctrl_config.hpp
index 35e288bc4..380efb0de 100644
--- a/mpm/lib/mykonos/config/ad937x_gain_ctrl_config.hpp
+++ b/mpm/lib/mykonos/config/ad937x_gain_ctrl_config.hpp
@@ -1,7 +1,7 @@
 //
-// Copyright 2017 Ettus Research, National Instruments Company
+// Copyright 2017 Ettus Research, a National Instruments Company
 //
-// SPDX-License-Identifier: GPL-3.0
+// SPDX-License-Identifier: GPL-3.0-or-later
 //
 
 #pragma once