diff --git a/CONFIGURING b/CONFIGURING
index 359d3c2..ec70667 100644
--- a/CONFIGURING
+++ b/CONFIGURING
@@ -45,7 +45,7 @@ Tom Early, n7tae (at) arrl (dot) net
 
 /*
  *   Copyright (C) 2010, 2011, 2012 by Scott Lawson KI4LKF
- *   addition Copyright (C) 2015 by Thomas A. Early AC2IE
+ *   addition Copyright (C) 2015 by Thomas A. Early N7TAE
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/DVAPDongle.cpp b/DVAPDongle.cpp
index c4a8c0b..d89d0cf 100644
--- a/DVAPDongle.cpp
+++ b/DVAPDongle.cpp
@@ -1,5 +1,5 @@
 /*
- *   Copyright 2017 by Thomas Early, AC2IE
+ *   Copyright 2017 by Thomas Early, N7TAE
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/DVAPDongle.h b/DVAPDongle.h
index d0aff5e..b4d0636 100644
--- a/DVAPDongle.h
+++ b/DVAPDongle.h
@@ -1,6 +1,6 @@
 #pragma once
 /*
- *   Copyright 2017 by Thomas Early, AC2IE
+ *   Copyright 2017 by Thomas Early, N7TAE
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/README.md b/README.md
index f8aa5fa..cc7dcd3 100644
--- a/README.md
+++ b/README.md
@@ -46,4 +46,4 @@ Reboot and enjoy!............................ "sudo reboot"
 
 Tom
 
-AC2IE (at) arrl (dot) net
+N7TAE (at) arrl (dot) net
diff --git a/aprs.cpp b/aprs.cpp
index 2c28ccb..8f73fe1 100644
--- a/aprs.cpp
+++ b/aprs.cpp
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2016 by Thomas A. Early AC2IE
+ *   Copyright (C) 2016 by Thomas A. Early N7TAE
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/aprs.h b/aprs.h
index 084c715..e06dd2e 100644
--- a/aprs.h
+++ b/aprs.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- *   Copyright (C) 2016 by Thomas A. Early AC2IE
+ *   Copyright (C) 2016 by Thomas A. Early N7TAE
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/dvap_rptr.cpp b/dvap_rptr.cpp
index 4bce7cc..2ef9958 100644
--- a/dvap_rptr.cpp
+++ b/dvap_rptr.cpp
@@ -1,7 +1,7 @@
 /*
  *   Copyright (C) 2010, 2011 by Scott Lawson KI4LKF
  *
- *   Copyright (C) 2015 by Thomas A. Early AC2IE
+ *   Copyright (C) 2015 by Thomas A. Early N7TAE
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
  */
 
 /***
-   KI4LKF, AC2IE
+   KI4LKF, N7TAE
 ***/
 
 #include <stdio.h>
diff --git a/dvrptr.cpp b/dvrptr.cpp
index d10afdf..a1c953a 100644
--- a/dvrptr.cpp
+++ b/dvrptr.cpp
@@ -1,6 +1,6 @@
 /*
  * DVRPTR Repeater for Linux
- * Autor: DG1HT DH2YBE KI4LKF AC2IE
+ * Autor: DG1HT DH2YBE KI4LKF N7TAE
  *
  --------------------------------------------------------------------------------------------------------*/
 #include <stdio.h>
diff --git a/g2_ircddb.cpp b/g2_ircddb.cpp
index 149d6ce..f21acea 100644
--- a/g2_ircddb.cpp
+++ b/g2_ircddb.cpp
@@ -1,7 +1,7 @@
 /*
  *   Copyright (C) 2010 by Scott Lawson KI4LKF
  *
- *   Copyright 2017 by Thomas Early, AC2IE
+ *   Copyright 2017 by Thomas Early, N7TAE
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
  */
 
 
-/* by KI4LKF, AC2IE */
+/* by KI4LKF, N7TAE */
 /*
    g2_ircddb is a dstar G2 gateway, using irc routing
        adapted from the OpenG2 G2 gateway
diff --git a/g2_link.cpp b/g2_link.cpp
index 5cdb4f6..df50865 100644
--- a/g2_link.cpp
+++ b/g2_link.cpp
@@ -2,7 +2,7 @@
 /*
  *   Copyright (C) 2010 by Scott Lawson KI4LKF
  *   Additional:
- *   Copyright (C) 2015 by Thomas A. Early AC2IE
+ *   Copyright (C) 2015 by Thomas A. Early N7TAE
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
  */
 
 
-/* by KI4LKF and AC2IE*/
+/* by KI4LKF and N7TAE*/
 
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/g2_typedefs.h b/g2_typedefs.h
index 3608214..b81b0c6 100644
--- a/g2_typedefs.h
+++ b/g2_typedefs.h
@@ -1,6 +1,6 @@
 #pragma once
 /*
- *   Copyright 2017 by Thomas Early, AC2IE
+ *   Copyright 2017 by Thomas Early, N7TAE
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by