diff --git a/src/main/com/jdblabs/timestamper/core/AuthenticationException.java b/src/main/com/jdblabs/timestamper/core/AuthenticationException.java
index 8a2a402..f6bc7a8 100644
--- a/src/main/com/jdblabs/timestamper/core/AuthenticationException.java
+++ b/src/main/com/jdblabs/timestamper/core/AuthenticationException.java
@@ -1,10 +1,10 @@
-package com.jdbernard.timestamper.core;
+package com.jdblabs.timestamper.core;
 
 import java.io.IOException;
 
 /**
  *
- * @author Jonathan Bernard ({@literal jonathan.bernard@gemalto.com})
+ * @author Jonathan Bernard ({@literal jdbernard@gmail.com})
  */
 public class AuthenticationException extends IOException {
 
diff --git a/src/main/com/jdblabs/timestamper/core/FileTimelineSource.java b/src/main/com/jdblabs/timestamper/core/FileTimelineSource.java
index 61259f6..770c93e 100644
--- a/src/main/com/jdblabs/timestamper/core/FileTimelineSource.java
+++ b/src/main/com/jdblabs/timestamper/core/FileTimelineSource.java
@@ -1,4 +1,4 @@
-package com.jdbernard.timestamper.core;
+package com.jdblabs.timestamper.core;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -9,7 +9,7 @@ import java.net.URI;
 
 /**
  *
- * @author Jonathan Bernard ({@literal jonathan.bernard@gemalto.com})
+ * @author Jonathan Bernard ({@literal jdbernard@gmail.com})
  */
 public class FileTimelineSource extends TimelineSource {
 
diff --git a/src/main/com/jdblabs/timestamper/core/StreamBasedTimelineSource.java b/src/main/com/jdblabs/timestamper/core/StreamBasedTimelineSource.java
index cbcdae1..725f93c 100644
--- a/src/main/com/jdblabs/timestamper/core/StreamBasedTimelineSource.java
+++ b/src/main/com/jdblabs/timestamper/core/StreamBasedTimelineSource.java
@@ -1,4 +1,4 @@
-package com.jdbernard.timestamper.core;
+package com.jdblabs.timestamper.core;
 
 import java.io.ByteArrayOutputStream;
 import java.io.FileNotFoundException;
@@ -14,7 +14,7 @@ import java.util.Scanner;
 
 /**
  *
- * @author Jonathan Bernard ({@literal jonathan.bernard@gemalto.com})
+ * @author Jonathan Bernard ({@literal jdbernard@gmail.com})
  */
 public class StreamBasedTimelineSource extends TimelineSource {
 
diff --git a/src/main/com/jdblabs/timestamper/core/SyncTarget.java b/src/main/com/jdblabs/timestamper/core/SyncTarget.java
index b7b07c8..6ec779e 100644
--- a/src/main/com/jdblabs/timestamper/core/SyncTarget.java
+++ b/src/main/com/jdblabs/timestamper/core/SyncTarget.java
@@ -1,4 +1,4 @@
-package com.jdbernard.timestamper.core;
+package com.jdblabs.timestamper.core;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -7,7 +7,7 @@ import java.util.TimerTask;
 
 /**
  * A remote target synchronized against the local timeline.
- * @author Jonathan Bernard (jonathan.bernard@gemalto.com)
+ * @author Jonathan Bernard (jdbernard@gmail.com)
  */
 public class SyncTarget {
 
diff --git a/src/main/com/jdblabs/timestamper/core/Timeline.java b/src/main/com/jdblabs/timestamper/core/Timeline.java
index 4fd6c93..7c590b4 100644
--- a/src/main/com/jdblabs/timestamper/core/Timeline.java
+++ b/src/main/com/jdblabs/timestamper/core/Timeline.java
@@ -1,4 +1,4 @@
-package com.jdbernard.timestamper.core;
+package com.jdblabs.timestamper.core;
 
 import java.text.SimpleDateFormat;
 
diff --git a/src/main/com/jdblabs/timestamper/core/TimelineMarker.java b/src/main/com/jdblabs/timestamper/core/TimelineMarker.java
index 53378f1..7448910 100644
--- a/src/main/com/jdblabs/timestamper/core/TimelineMarker.java
+++ b/src/main/com/jdblabs/timestamper/core/TimelineMarker.java
@@ -1,4 +1,4 @@
-package com.jdbernard.timestamper.core;
+package com.jdblabs.timestamper.core;
 
 import java.util.Date;
 
diff --git a/src/main/com/jdblabs/timestamper/core/TimelineProperties.java b/src/main/com/jdblabs/timestamper/core/TimelineProperties.java
index 23d6acd..8f9967b 100644
--- a/src/main/com/jdblabs/timestamper/core/TimelineProperties.java
+++ b/src/main/com/jdblabs/timestamper/core/TimelineProperties.java
@@ -1,4 +1,4 @@
-package com.jdbernard.timestamper.core;
+package com.jdblabs.timestamper.core;
 
 import java.io.File;
 import java.io.IOException;
@@ -37,7 +37,7 @@ import com.jdbernard.util.SmartConfig;
  * <tr><td><code>remote.timeline.</code><i>name</i>
  *      <code>.updateInterval</code></td><td>The time in milliseconds between
  *      synching the <i>name</i> remote timeline.</td></tr></table>
- * @author Jonathan Bernard ({@literal jonathan.bernard@gemalto.com})
+ * @author Jonathan Bernard ({@literal jdbernard@gmail.com})
  * @see com.jdbernard.timestamper.core.Timeline
  * @see com.jdbernard.timestamper.core.TimelineSource
  * @see com.jdbernard.timestamper.core.SyncTarget
diff --git a/src/main/com/jdblabs/timestamper/core/TimelineSource.java b/src/main/com/jdblabs/timestamper/core/TimelineSource.java
index de85445..ff7f44b 100644
--- a/src/main/com/jdblabs/timestamper/core/TimelineSource.java
+++ b/src/main/com/jdblabs/timestamper/core/TimelineSource.java
@@ -1,11 +1,11 @@
-package com.jdbernard.timestamper.core;
+package com.jdblabs.timestamper.core;
 
 import java.io.IOException;
 import java.net.URI;
 
 /**
  * A means of loading and persisting a Timeline.
- * @author Jonathan Bernard (jonathan.bernard@gemalto.com)
+ * @author Jonathan Bernard (jdbernard@gmail.com)
  */
 public abstract class TimelineSource {
 
diff --git a/src/main/com/jdblabs/timestamper/core/TimelineSourceFactory.java b/src/main/com/jdblabs/timestamper/core/TimelineSourceFactory.java
index 44ac320..d4c4c16 100644
--- a/src/main/com/jdblabs/timestamper/core/TimelineSourceFactory.java
+++ b/src/main/com/jdblabs/timestamper/core/TimelineSourceFactory.java
@@ -1,11 +1,11 @@
-package com.jdbernard.timestamper.core;
+package com.jdblabs.timestamper.core;
 
 import java.io.File;
 import java.net.URI;
 
 /**
  *
- * @author Jonathan Bernard ({@literal jonathan.bernard@gemalto.com})
+ * @author Jonathan Bernard ({@literal jdbernard@gmail.com})
  */
 public class TimelineSourceFactory {
 
diff --git a/src/main/com/jdblabs/timestamper/core/TwitterTimelineSource.java b/src/main/com/jdblabs/timestamper/core/TwitterTimelineSource.java
index 2544048..9ec9a1b 100644
--- a/src/main/com/jdblabs/timestamper/core/TwitterTimelineSource.java
+++ b/src/main/com/jdblabs/timestamper/core/TwitterTimelineSource.java
@@ -1,11 +1,11 @@
-package com.jdbernard.timestamper.core;
+package com.jdblabs.timestamper.core;
 
 import java.io.IOException;
 import java.net.URI;
 
 /**
  *
- * @author Jonathan Bernard ({@literal jonathan.bernard@gemalto.com})
+ * @author Jonathan Bernard ({@literal jdbernard@gmail.com})
  */
 public class TwitterTimelineSource extends TimelineSource {