diff --git a/BUILDING b/BUILDING
index 7b42f2c..c75c94d 100644
--- a/BUILDING
+++ b/BUILDING
@@ -53,7 +53,7 @@ After you configure you RPi or BBB, update, upgrade and install all the required
 packages, the gateway installation can begin. Go to your login home directory and
 (without root privileges type:
 
-git clone git://github.com/ac2ie/g2_ircddb.git
+git clone git://github.com/n7tae/g2_ircddb.git
 
 This will create a g2_ircddb directory with everything you need to build a dvap or
 dvrptr ircddb gateway.
@@ -148,4 +148,4 @@ If you want to uninstall everything return to the build directory and type eithe
 uninstalldtmfs".  This will shutdown and remove the service scripts and links and
 remove most everything from /usr/local.
 
-Tom Early, ac2ie@arrl.net
+Tom Early, n7tae@arrl.net
diff --git a/CONFIGURING b/CONFIGURING
index 68626f0..359d3c2 100644
--- a/CONFIGURING
+++ b/CONFIGURING
@@ -41,7 +41,7 @@ However, most hams won't have to bother with them!
 
 Some other features are discussed below.
 
-Tom Early, ac2ie (at) arrl (dot) net
+Tom Early, n7tae (at) arrl (dot) net
 
 /*
  *   Copyright (C) 2010, 2011, 2012 by Scott Lawson KI4LKF
diff --git a/README.md b/README.md
index f2b4aec..f8aa5fa 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ and maybe a few more of your favorite packages. Here is one of my favorites: `su
 
 After you install all the required packages, the g2_ircddb gateway installation can begin. Go to your login home directory and (without root privileges) type:
 ```
-git clone git://github.com/ac2ie/g2_ircddb.git
+git clone git://github.com/n7tae/g2_ircddb.git
 ```
 Then cd into the new g2_ircddb directory and review the `BUILDING` and `CONFIGURING` file for further instructions, here is an outline:
 ```
diff --git a/g2.everything.cfg b/g2.everything.cfg
index 9af8998..580fa4a 100644
--- a/g2.everything.cfg
+++ b/g2.everything.cfg
@@ -68,8 +68,8 @@ module = {
 #		desc1 = ""
 #		desc2 = ""
 
-		# the url of your repeater, 80 chars max, defaults to "github.com/ac2ie/g2_ircddb
-#		url = ""           # 80 char max, defaults to "github.com/ac2ie/g2_ircddb
+		# the url of your repeater, 80 chars max, defaults to "github.com/n7tae/g2_ircddb
+#		url = ""           # 80 char max, defaults to "github.com/n7tae/g2_ircddb
 
 		# If you want to enable/disable the repeater, set these options.
 		#   Each of these options can NOT be more than 8 characters.
@@ -208,8 +208,8 @@ module = {
 #		desc1 = ""
 #		desc2 = ""
 
-		# the url of your repeater, 80 chars max, defaults to "github.com/ac2ie/g2_ircddb
-#		url = ""           # 80 char max, defaults to "github.com/ac2ie/g2_ircddb
+		# the url of your repeater, 80 chars max, defaults to "github.com/n7tae/g2_ircddb
+#		url = ""           # 80 char max, defaults to "github.com/n7tae/g2_ircddb
 
 		# where other g2 programs find this repeater software
 #		ip = "127.0.0.1"   # where is the device running? must be a "dotted number"
diff --git a/g2_ircddb.cpp b/g2_ircddb.cpp
index e156279..149d6ce 100644
--- a/g2_ircddb.cpp
+++ b/g2_ircddb.cpp
@@ -406,7 +406,7 @@ static bool read_config(char *cfgFile)
 				rptr.mod[m].desc1 = "";
 			if (! cfg.lookupValue(path+".desc2", rptr.mod[m].desc2))
 				rptr.mod[m].desc2 = "";
-			if (! get_value(cfg, std::string(path+".url").c_str(), rptr.mod[m].url, 0, 80, "github.com/ac2ie/g2_ircddb"))
+			if (! get_value(cfg, std::string(path+".url").c_str(), rptr.mod[m].url, 0, 80, "github.com/n7tae/g2_ircddb"))
 				return true;
 			// truncate strings
 			if (rptr.mod[m].desc1.length() > 20)
diff --git a/get_reflectors.sh b/get_reflectors.sh
index 7854b28..8352a97 100755
--- a/get_reflectors.sh
+++ b/get_reflectors.sh
@@ -4,7 +4,7 @@
 #
 # 73
 #
-# Tom, ac2ie@arrl.net
+# Tom, n7tae@arrl.net
 
 if [ -e gwys.txt ]; then
 	mv -f gwys.txt gwys.txt.orig