diff --git a/Keypad_I2C/Keypad_I2C.cpp b/Keypad_I2C/Keypad_I2C.cpp
index ab2593a..92b7a71 100644
--- a/Keypad_I2C/Keypad_I2C.cpp
+++ b/Keypad_I2C/Keypad_I2C.cpp
@@ -1,6 +1,6 @@
 /*
 ||
-|| @file Keypad_I2C.h
+|| @file Keypad_I2C.cpp
 || @version 3.0 - multiple WireX support
 || @version 2.0 - PCF8575 support added by Paul Williamson
 || @author G. D. (Joe) Young, ptw
diff --git a/Keypad_I2Ca/Keypad_I2Ca.cpp b/Keypad_I2Ca/Keypad_I2Ca.cpp
index 51cf4ba..8df2333 100644
--- a/Keypad_I2Ca/Keypad_I2Ca.cpp
+++ b/Keypad_I2Ca/Keypad_I2Ca.cpp
@@ -1,11 +1,11 @@
 /*
 ||
-|| @file Keypad_I2Ca.h
+|| @file Keypad_I2Ca.cpp
 || @version 4.0 - fix compile error, allow WireX in constructor
 || @version 3.0 - PCA9554, PCA9554A, PCA9555 support G. D. Young
 || @version 2.0 - PCF8575 support added by Paul Williamson
 || @author G. D. (Joe) Young, ptw
-|| @contact "G. D. (Joe) Young" <gdyoung@telus.net>
+|| @contact "G. D. (Joe) Young" <jyoung@islandnet.com>
 ||
 || @description
 || | Keypad_I2Ca provides an interface for using matrix keypads that
diff --git a/Keypad_MC16/Keypad_MC16.cpp b/Keypad_MC16/Keypad_MC16.cpp
index 9dce8b6..9cabe66 100644
--- a/Keypad_MC16/Keypad_MC16.cpp
+++ b/Keypad_MC16/Keypad_MC16.cpp
@@ -1,6 +1,6 @@
 /*
 ||
-|| @file Keypad_MC16.h
+|| @file Keypad_MC16.cpp
 || @version 2.0
 || @version 1.0
 || @author G. D. (Joe) Young
diff --git a/Keypad_MC17/Keypad_MC17.cpp b/Keypad_MC17/Keypad_MC17.cpp
index ac4f466..278c9f3 100644
--- a/Keypad_MC17/Keypad_MC17.cpp
+++ b/Keypad_MC17/Keypad_MC17.cpp
@@ -1,9 +1,9 @@
 /*
 ||
-|| @file Keypad_MC17.h
+|| @file Keypad_MC17.cpp
 || @version 2.0
 || @author G. D. (Joe) Young
-|| @contact "G. D. (Joe) Young" <gdyoung@telus.net>
+|| @contact "G. D. (Joe) Young" <jyoung@islandnet.com>
 ||
 || @description
 || | Keypad_MC17 provides an interface for using matrix keypads that
diff --git a/Keypad_MCP/Keypad_MCP.cpp b/Keypad_MCP/Keypad_MCP.cpp
index e36871e..9b20b68 100644
--- a/Keypad_MCP/Keypad_MCP.cpp
+++ b/Keypad_MCP/Keypad_MCP.cpp
@@ -1,10 +1,10 @@
 /*
 ||
-|| @file Keypad_MCP.h
+|| @file Keypad_MCP.cpp
 || @version 2.0
 || @version 1.0
 || @author G. D. (Joe) Young
-|| @contact "G. D. (Joe) Young" <gdyoung@telus.net>
+|| @contact "G. D. (Joe) Young" <jyoung@islandnet.com>
 ||
 || @description
 || | Keypad_MCP provides an interface for using matrix keypads that
diff --git a/Keypad_MCP/Keypad_MCP.h b/Keypad_MCP/Keypad_MCP.h
index 7aad1f6..43e0218 100644
--- a/Keypad_MCP/Keypad_MCP.h
+++ b/Keypad_MCP/Keypad_MCP.h
@@ -4,7 +4,7 @@
 || @version 2.0
 || @version 1.0
 || @author G. D. (Joe) Young
-|| @contact "G. D. (Joe) Young" <gdyoung@telus.net>
+|| @contact "G. D. (Joe) Young" <jyoung@islandnet.com>
 ||
 || @description
 || | Keypad_MCP provides an interface for using matrix keypads that
diff --git a/Keypad_tw/Keypad_tw.cpp b/Keypad_tw/Keypad_tw.cpp
index ecbf0fe..de6c8bf 100644
--- a/Keypad_tw/Keypad_tw.cpp
+++ b/Keypad_tw/Keypad_tw.cpp
@@ -1,10 +1,10 @@
 /*
 ||
-|| @file Keypad_tw.h
+|| @file Keypad_tw.cpp
 || @version 1.0 - Convert Keypad_I2C to use TinyWireM library for ATtiny micros
 || @version 2.0 - PCF8575 support added by Paul Williamson
 || @author G. D. (Joe) Young, ptw
-|| @contact "G. D. (Joe) Young" <gdyoung@islandnet.com>
+|| @contact "G. D. (Joe) Young" <jyoung@islandnet.com>
 ||
 || @description
 || | Keypad_tw provides an interface for using matrix keypads that
diff --git a/Keypad_tw/Keypad_tw.h b/Keypad_tw/Keypad_tw.h
index 20fd702..f1cc488 100644
--- a/Keypad_tw/Keypad_tw.h
+++ b/Keypad_tw/Keypad_tw.h
@@ -4,7 +4,7 @@
 || @version 1.0 - Convert Keypad_I2C to use TinyWireM library for ATtiny micros
 || @version 2.0 - PCF8575 support added by Paul Williamson
 || @author G. D. (Joe) Young, ptw
-|| @contact "G. D. (Joe) Young" <gdyoung@islandnet.com>
+|| @contact "G. D. (Joe) Young" <jyoung@islandnet.com>
 ||
 || @description
 || | Keypad_tw provides an interface for using matrix keypads that