diff --git a/LICENSE b/LICENSE
index 908b47cb..1daf4002 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
 MIT License
 
 Copyright (C) 2014-2016 IBM Corporation
-Copyright (c) 2016-2017 MCCI Corporation
+Copyright (c) 2016-2018 MCCI Corporation
 Copyright (c) 2015 Thomas Telkamp and Matthijs Kooijman
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/examples/raw-feather/raw-feather.ino b/examples/raw-feather/raw-feather.ino
index d32054b3..0f624f0b 100644
--- a/examples/raw-feather/raw-feather.ino
+++ b/examples/raw-feather/raw-feather.ino
@@ -1,5 +1,3 @@
-/* raw-feather.ino	Tue Jan 23 2018 10:25:50 chwon */
-
 /*
 
 Module:  raw-feather.ino
@@ -7,32 +5,13 @@ Module:  raw-feather.ino
 Function:
         Slightly improved Raw test example, for Adafruit Feather M0 LoRa
 
-Version:
-        V0.7.0	Tue Jan 23 2018 10:25:50 chwon	Edit level 2
-
-Copyright notice:
-        This file copyright (C) 2017, 2018 by
-
-                MCCI Corporation
-                3520 Krums Corners Road
-                Ithaca, NY  14850
-
-        An unpublished work.  All rights reserved.
-
-        This file is proprietary information, and may not be disclosed or
-        copied without the prior permission of MCCI Corporation.
+Copyright notice and License:
+        See LICENSE file accompanying this project.
 
 Author:
         Matthijs Kooijman  2015
         Terry Moore, MCCI Corporation	April 2017
 
-Revision history:
-   0.5.0  Sat Apr  1 2017 22:26:22  tmm
-        Module created.
-
-   0.7.0  Tue Jan 23 2018 10:25:50  chwon
-        Add Catena 4551 platform support.
-
 */
 
 /*******************************************************************************
diff --git a/src/hal/hal.h b/src/hal/hal.h
index c5ea1007..1909c5a5 100644
--- a/src/hal/hal.h
+++ b/src/hal/hal.h
@@ -1,5 +1,7 @@
 /*******************************************************************************
- * Copyright (c) 2015 Matthijs Kooijman
+ * Copyright (c) 2015-2016 Matthijs Kooijman
+ * Copyright (c) 2016-2018 MCCI Corporation
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/src/lmic/hal.h b/src/lmic/hal.h
index 562b4283..51866d9a 100644
--- a/src/lmic/hal.h
+++ b/src/lmic/hal.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2014-2016 IBM Corporation.
+ * Copyright (c) 2016, 2018 MCCI Corporation.
  * All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
diff --git a/src/lmic/lmic.h b/src/lmic/lmic.h
index 7f2ea441..836f1465 100644
--- a/src/lmic/lmic.h
+++ b/src/lmic/lmic.h
@@ -1,5 +1,7 @@
 /*
  * Copyright (c) 2014-2016 IBM Corporation.
+ * Copyright (c) 2016 Matthijs Kooijman.
+ * Copyright (c) 2016-2018 MCCI Corporation.
  * All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
diff --git a/src/lmic/lorabase.h b/src/lmic/lorabase.h
index 3e57a9cd..97f992dd 100644
--- a/src/lmic/lorabase.h
+++ b/src/lmic/lorabase.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2014-2016 IBM Corporation.
+ * Copyritght (c) 2017 MCCI Corporation.
  * All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
diff --git a/src/lmic/oslmic.c b/src/lmic/oslmic.c
index ddb6d0ee..e2bc570d 100644
--- a/src/lmic/oslmic.c
+++ b/src/lmic/oslmic.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2014-2016 IBM Corporation.
+ * Copyright (c) 2016-2017 MCCI Corporation.
  * All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
diff --git a/src/lmic/radio.c b/src/lmic/radio.c
index c43da5e6..cbda56d6 100644
--- a/src/lmic/radio.c
+++ b/src/lmic/radio.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2014-2016 IBM Corporation.
+ * Copyright (c) 2016-2018 MCCI Corporation.
  * All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without