Releng : Update Konstantin's e-mail address
diff --git a/plugins/org.eclipse.sapphire.doc/src/org/eclipse/sapphire/doc/internal/DynamicContentProducer.java b/plugins/org.eclipse.sapphire.doc/src/org/eclipse/sapphire/doc/internal/DynamicContentProducer.java
index 381a8cb..f6a83d6 100644
--- a/plugins/org.eclipse.sapphire.doc/src/org/eclipse/sapphire/doc/internal/DynamicContentProducer.java
+++ b/plugins/org.eclipse.sapphire.doc/src/org/eclipse/sapphire/doc/internal/DynamicContentProducer.java
@@ -52,7 +52,7 @@
 import org.eclipse.sapphire.ui.def.ActionHandlerFilterDef;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class DynamicContentProducer implements IHelpContentProducer
diff --git a/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/JavaTypeJumpActionHandler.java b/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/JavaTypeJumpActionHandler.java
index 16694c4..d0f0189 100644
--- a/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/JavaTypeJumpActionHandler.java
+++ b/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/JavaTypeJumpActionHandler.java
@@ -29,7 +29,7 @@
 import org.eclipse.sapphire.ui.forms.swt.FormComponentPresentation;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class JavaTypeJumpActionHandler extends JumpActionHandler
diff --git a/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaPackageBrowseActionHandler.java b/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaPackageBrowseActionHandler.java
index de756ac..bbbf250 100644
--- a/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaPackageBrowseActionHandler.java
+++ b/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaPackageBrowseActionHandler.java
@@ -35,7 +35,7 @@
 
 /**
  * @author <a href="mailto:andreas.weise@agito-it.de">Andreas Weise</a>
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class JavaPackageBrowseActionHandler extends BrowseActionHandler {
diff --git a/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeBrowseActionHandler.java b/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeBrowseActionHandler.java
index f55457c..5a74239 100644
--- a/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeBrowseActionHandler.java
+++ b/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeBrowseActionHandler.java
@@ -42,7 +42,7 @@
 import org.eclipse.ui.dialogs.SelectionDialog;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:gregory.amerson@liferay.com">Gregory Amerson</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeCreateActionHandler.java b/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeCreateActionHandler.java
index 1c42dd7..a5d4206 100644
--- a/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeCreateActionHandler.java
+++ b/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeCreateActionHandler.java
@@ -77,7 +77,7 @@
 import org.eclipse.ui.IWorkbenchPartSite;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:gregory.amerson@liferay.com">Gregory Amerson</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeCreateAnnotationActionHandler.java b/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeCreateAnnotationActionHandler.java
index aca440c..d7b2139 100644
--- a/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeCreateAnnotationActionHandler.java
+++ b/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeCreateAnnotationActionHandler.java
@@ -16,7 +16,7 @@
 import org.eclipse.sapphire.java.JavaTypeKind;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:gregory.amerson@liferay.com">Gregory Amerson</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeCreateClassActionHandler.java b/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeCreateClassActionHandler.java
index da00f84..300f987 100644
--- a/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeCreateClassActionHandler.java
+++ b/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeCreateClassActionHandler.java
@@ -18,7 +18,7 @@
 import org.eclipse.sapphire.java.JavaTypeKind;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:gregory.amerson@liferay.com">Gregory Amerson</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeCreateEnumActionHandler.java b/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeCreateEnumActionHandler.java
index 6fe9e40..11881f2 100644
--- a/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeCreateEnumActionHandler.java
+++ b/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeCreateEnumActionHandler.java
@@ -16,7 +16,7 @@
 import org.eclipse.sapphire.java.JavaTypeKind;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:gregory.amerson@liferay.com">Gregory Amerson</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeCreateInterfaceActionHandler.java b/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeCreateInterfaceActionHandler.java
index e3543ee..b160011 100644
--- a/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeCreateInterfaceActionHandler.java
+++ b/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeCreateInterfaceActionHandler.java
@@ -16,7 +16,7 @@
 import org.eclipse.sapphire.java.JavaTypeKind;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:gregory.amerson@liferay.com">Gregory Amerson</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeJumpActionHandlerCondition.java b/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeJumpActionHandlerCondition.java
index 8164841..e865a75 100644
--- a/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeJumpActionHandlerCondition.java
+++ b/plugins/org.eclipse.sapphire.java.jdt.ui/src/org/eclipse/sapphire/java/jdt/ui/internal/JavaTypeJumpActionHandlerCondition.java
@@ -20,7 +20,7 @@
 import org.eclipse.sapphire.ui.forms.PropertyEditorPart;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class JavaTypeJumpActionHandlerCondition extends PropertyEditorCondition
diff --git a/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/JdtJavaType.java b/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/JdtJavaType.java
index eb88514..6536821 100644
--- a/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/JdtJavaType.java
+++ b/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/JdtJavaType.java
@@ -23,7 +23,7 @@
 import org.eclipse.sapphire.java.JavaTypeKind;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class JdtJavaType extends JavaType
diff --git a/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/JdtUtil.java b/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/JdtUtil.java
index 11df4e4..1a4b9a2 100644
--- a/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/JdtUtil.java
+++ b/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/JdtUtil.java
@@ -28,7 +28,7 @@
 /**

  * Collection of utility functions for Java Developer Tools.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class JdtUtil

diff --git a/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/internal/ElementToContextConversionService.java b/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/internal/ElementToContextConversionService.java
index 34725a2..a5d39f8 100644
--- a/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/internal/ElementToContextConversionService.java
+++ b/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/internal/ElementToContextConversionService.java
@@ -21,7 +21,7 @@
 /**
  * ConversionService implementation for Element to Context conversions when the resource is inside a Java project.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ElementToContextConversionService extends ConversionService<Element,Context>
diff --git a/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/internal/JavaProjectContext.java b/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/internal/JavaProjectContext.java
index ba8fe84..145e41b 100644
--- a/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/internal/JavaProjectContext.java
+++ b/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/internal/JavaProjectContext.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.Context;

 

 /**

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class JavaProjectContext extends Context

diff --git a/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/internal/JdtJavaTypeReferenceService.java b/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/internal/JdtJavaTypeReferenceService.java
index 9d86f03..83a5bb6 100644
--- a/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/internal/JdtJavaTypeReferenceService.java
+++ b/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/internal/JdtJavaTypeReferenceService.java
@@ -33,7 +33,7 @@
 import org.eclipse.sapphire.services.ServiceContext;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class JdtJavaTypeReferenceService extends JavaTypeReferenceService
diff --git a/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/internal/ResourceStoreToIJavaProjectConversionService.java b/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/internal/ResourceStoreToIJavaProjectConversionService.java
index 742c726..95172fb 100644
--- a/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/internal/ResourceStoreToIJavaProjectConversionService.java
+++ b/plugins/org.eclipse.sapphire.java.jdt/src/org/eclipse/sapphire/java/jdt/internal/ResourceStoreToIJavaProjectConversionService.java
@@ -20,7 +20,7 @@
 /**
  * ConversionService implementation for ResourceStore to IJavaProject conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ResourceStoreToIJavaProjectConversionService extends ConversionService<ResourceStore,IJavaProject>
diff --git a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/ClassBasedJavaType.java b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/ClassBasedJavaType.java
index 2f98fd6..4bf1780 100644
--- a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/ClassBasedJavaType.java
+++ b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/ClassBasedJavaType.java
@@ -17,7 +17,7 @@
 import java.util.Set;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ClassBasedJavaType extends JavaType
diff --git a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaIdentifier.java b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaIdentifier.java
index 5fe5926..b4d2553 100644
--- a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaIdentifier.java
+++ b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaIdentifier.java
@@ -20,7 +20,7 @@
  * A Java identifier is a name of a variable, a field or a method. Identifiers must conform
  * to <nobr>[a-zA-Z_$][a-zA-Z0-9_$]*</nobr> pattern. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Label( standard = "Java identifier" )
diff --git a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaPackageName.java b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaPackageName.java
index 8c4befd..c5cfc40 100644
--- a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaPackageName.java
+++ b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaPackageName.java
@@ -14,7 +14,7 @@
 import org.eclipse.sapphire.modeling.annotations.Label;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Label( standard = "Java package name" )
diff --git a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaQualifiedName.java b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaQualifiedName.java
index b871d04..3333557 100644
--- a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaQualifiedName.java
+++ b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaQualifiedName.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.java;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class JavaQualifiedName implements Comparable<JavaQualifiedName>
diff --git a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaType.java b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaType.java
index ef530c6..3a7d7d0 100644
--- a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaType.java
+++ b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaType.java
@@ -14,7 +14,7 @@
 import java.util.Set;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class JavaType
diff --git a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeConstraint.java b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeConstraint.java
index 2141b1f..48db396 100644
--- a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeConstraint.java
+++ b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeConstraint.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.java;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 import java.lang.annotation.ElementType;
diff --git a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeConstraintBehavior.java b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeConstraintBehavior.java
index ceb6fe9..b06568e 100644
--- a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeConstraintBehavior.java
+++ b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeConstraintBehavior.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.java;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public enum JavaTypeConstraintBehavior
diff --git a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeConstraintService.java b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeConstraintService.java
index 6521713..34ea91a 100644
--- a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeConstraintService.java
+++ b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeConstraintService.java
@@ -17,7 +17,7 @@
 import org.eclipse.sapphire.services.DataService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:gregory.amerson@liferay.com">Gregory Amerson</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeConstraintServiceData.java b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeConstraintServiceData.java
index dd294c0..f4354c7 100644
--- a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeConstraintServiceData.java
+++ b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeConstraintServiceData.java
@@ -17,7 +17,7 @@
 import java.util.TreeSet;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class JavaTypeConstraintServiceData
diff --git a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeKind.java b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeKind.java
index 56170e3..c70c22d 100644
--- a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeKind.java
+++ b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeKind.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.java;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public enum JavaTypeKind
diff --git a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeName.java b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeName.java
index 36017fb..f7daa11 100644
--- a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeName.java
+++ b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeName.java
@@ -14,7 +14,7 @@
 import org.eclipse.sapphire.modeling.annotations.Label;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Label( standard = "Java type name" )
diff --git a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeReferenceService.java b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeReferenceService.java
index fdafc24..fccfdaa 100644
--- a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeReferenceService.java
+++ b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/JavaTypeReferenceService.java
@@ -15,7 +15,7 @@
 import org.eclipse.sapphire.services.ReferenceService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class JavaTypeReferenceService extends ReferenceService<JavaType>
diff --git a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/JavaTypeConstraintFactsService.java b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/JavaTypeConstraintFactsService.java
index df70257..8728cd3 100644
--- a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/JavaTypeConstraintFactsService.java
+++ b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/JavaTypeConstraintFactsService.java
@@ -35,7 +35,7 @@
  * Creates fact statements about Java type property's constraints by using semantical information 
  * specified by @JavaTypeConstraints annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:gregory.amerson@liferay.com">Gregory Amerson</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/JavaTypeValidationService.java b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/JavaTypeValidationService.java
index 9ff3bc6..81fdc28 100644
--- a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/JavaTypeValidationService.java
+++ b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/JavaTypeValidationService.java
@@ -34,7 +34,7 @@
 import org.eclipse.sapphire.services.ValidationService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:gregory.amerson@liferay.com">Gregory Amerson</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/StandardJavaTypeConstraintService.java b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/StandardJavaTypeConstraintService.java
index 52d8d4c..63ab72e 100644
--- a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/StandardJavaTypeConstraintService.java
+++ b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/StandardJavaTypeConstraintService.java
@@ -27,7 +27,7 @@
 import org.eclipse.sapphire.services.ServiceContext;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:gregory.amerson@liferay.com">Gregory Amerson</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/StandardJavaTypeReferenceService.java b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/StandardJavaTypeReferenceService.java
index 3ad40a7..ca6cb8e 100644
--- a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/StandardJavaTypeReferenceService.java
+++ b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/StandardJavaTypeReferenceService.java
@@ -23,7 +23,7 @@
 import org.eclipse.sapphire.services.ServiceContext;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StandardJavaTypeReferenceService extends JavaTypeReferenceService
diff --git a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/StringToJavaIdentifierConversionService.java b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/StringToJavaIdentifierConversionService.java
index 24061ef..c59793a 100644
--- a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/StringToJavaIdentifierConversionService.java
+++ b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/StringToJavaIdentifierConversionService.java
@@ -17,7 +17,7 @@
 /**
  * ConversionService implementation for String to JavaIdentifier conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToJavaIdentifierConversionService extends ConversionService<String,JavaIdentifier>
diff --git a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/StringToJavaPackageNameConversionService.java b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/StringToJavaPackageNameConversionService.java
index 3e12e41..2548765 100644
--- a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/StringToJavaPackageNameConversionService.java
+++ b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/StringToJavaPackageNameConversionService.java
@@ -17,7 +17,7 @@
 /**
  * ConversionService implementation for String to JavaPackageName conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToJavaPackageNameConversionService extends ConversionService<String,JavaPackageName>
diff --git a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/StringToJavaTypeNameConversionService.java b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/StringToJavaTypeNameConversionService.java
index 14bbc07..d34002d 100644
--- a/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/StringToJavaTypeNameConversionService.java
+++ b/plugins/org.eclipse.sapphire.java/src/org/eclipse/sapphire/java/internal/StringToJavaTypeNameConversionService.java
@@ -17,7 +17,7 @@
 /**
  * ConversionService implementation for String to JavaTypeName conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToJavaTypeNameConversionService extends ConversionService<String,JavaTypeName>
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/ChildXmlResource.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/ChildXmlResource.java
index 70f46ed..4c38484 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/ChildXmlResource.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/ChildXmlResource.java
@@ -15,7 +15,7 @@
 import org.eclipse.sapphire.Resource;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class ChildXmlResource extends XmlResource
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/FoldingXmlValueBindingImpl.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/FoldingXmlValueBindingImpl.java
index 9388294..16cf645 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/FoldingXmlValueBindingImpl.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/FoldingXmlValueBindingImpl.java
@@ -17,7 +17,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.CustomXmlValueBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class FoldingXmlValueBindingImpl extends XmlValueBindingImpl
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/RootElementController.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/RootElementController.java
index bff7917..135c3a2 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/RootElementController.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/RootElementController.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.modeling.xml;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class RootElementController
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/RootXmlResource.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/RootXmlResource.java
index ac9e4a7..a6d6f1b 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/RootXmlResource.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/RootXmlResource.java
@@ -41,7 +41,7 @@
 import org.w3c.dom.Text;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:kamesh.sampath@accenture.com">Kamesh Sampath</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardImpliedXmlElementBindingImpl.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardImpliedXmlElementBindingImpl.java
index 99b610f..c99fd09 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardImpliedXmlElementBindingImpl.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardImpliedXmlElementBindingImpl.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlElementBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StandardImpliedXmlElementBindingImpl extends ElementPropertyBinding
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardRootElementController.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardRootElementController.java
index 80fbfcd..0198b1c 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardRootElementController.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardRootElementController.java
@@ -25,7 +25,7 @@
 import org.w3c.dom.Element;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class StandardRootElementController extends RootElementController
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardXmlElementBindingImpl.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardXmlElementBindingImpl.java
index 491e63a..83ce762 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardXmlElementBindingImpl.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardXmlElementBindingImpl.java
@@ -36,7 +36,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlElementBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class StandardXmlElementBindingImpl extends LayeredElementBindingImpl
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardXmlListBindingImpl.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardXmlListBindingImpl.java
index 82f1a1d..2d3fccc 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardXmlListBindingImpl.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardXmlListBindingImpl.java
@@ -38,7 +38,7 @@
 import org.eclipse.sapphire.util.ListFactory;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:rcernich@redhat.com">Rob Cernich</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardXmlNamespaceResolver.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardXmlNamespaceResolver.java
index 8c3c0c4..952ad1c 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardXmlNamespaceResolver.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardXmlNamespaceResolver.java
@@ -17,7 +17,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlNamespaces;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:kamesh.sampath@accenture.com">Kamesh Sampath</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardXmlValueBindingImpl.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardXmlValueBindingImpl.java
index 9f97821..892cb16 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardXmlValueBindingImpl.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/StandardXmlValueBindingImpl.java
@@ -20,7 +20,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlValueBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class StandardXmlValueBindingImpl extends XmlValueBindingImpl
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/VirtualChildXmlResource.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/VirtualChildXmlResource.java
index 58911b2..ef76356 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/VirtualChildXmlResource.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/VirtualChildXmlResource.java
@@ -19,7 +19,7 @@
 import org.w3c.dom.Node;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class VirtualChildXmlResource extends XmlResource
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlAttribute.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlAttribute.java
index 8f41e2d..654d8b8 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlAttribute.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlAttribute.java
@@ -18,7 +18,7 @@
 import org.w3c.dom.Node;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class XmlAttribute
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlComment.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlComment.java
index 3220292..7c4c669 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlComment.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlComment.java
@@ -17,7 +17,7 @@
 import org.w3c.dom.Node;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class XmlComment
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlDelimitedListBindingImpl.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlDelimitedListBindingImpl.java
index c793743..6186867 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlDelimitedListBindingImpl.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlDelimitedListBindingImpl.java
@@ -15,7 +15,7 @@
 import org.eclipse.sapphire.modeling.DelimitedListBindingImpl;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class XmlDelimitedListBindingImpl extends DelimitedListBindingImpl
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlElement.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlElement.java
index 7dbd93e..a711fee 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlElement.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlElement.java
@@ -41,7 +41,7 @@
 import org.w3c.dom.Text;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class XmlElement extends XmlNode
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlMetaComment.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlMetaComment.java
index 3821536..befe1de 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlMetaComment.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlMetaComment.java
@@ -16,7 +16,7 @@
 import org.w3c.dom.Node;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class XmlMetaComment
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlNamespaceResolver.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlNamespaceResolver.java
index ff3b4ce..ea0d364 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlNamespaceResolver.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlNamespaceResolver.java
@@ -17,7 +17,7 @@
 import org.eclipse.sapphire.Text;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class XmlNamespaceResolver
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlNode.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlNode.java
index 78eb280..cb01795 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlNode.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlNode.java
@@ -30,7 +30,7 @@
 import org.w3c.dom.Text;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class XmlNode
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlPath.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlPath.java
index dcea6c3..a18b923 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlPath.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlPath.java
@@ -20,7 +20,7 @@
 import javax.xml.namespace.QName;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class XmlPath
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlResource.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlResource.java
index 18e108b..58b823c 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlResource.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlResource.java
@@ -26,7 +26,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.CustomXmlValueBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class XmlResource extends Resource
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlResourceStore.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlResourceStore.java
index ea6245a..1814661 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlResourceStore.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlResourceStore.java
@@ -50,7 +50,7 @@
 import org.xml.sax.SAXParseException;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class XmlResourceStore extends ResourceStore
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlUtil.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlUtil.java
index c451cac..cfc5390 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlUtil.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlUtil.java
@@ -27,7 +27,7 @@
 import org.w3c.dom.NodeList;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class XmlUtil
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlValueBindingImpl.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlValueBindingImpl.java
index 4079b1a..ae76b93 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlValueBindingImpl.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/XmlValueBindingImpl.java
@@ -14,7 +14,7 @@
 import org.eclipse.sapphire.ValuePropertyBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class XmlValueBindingImpl extends ValuePropertyBinding
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/CustomXmlElementBinding.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/CustomXmlElementBinding.java
index fe8ca4f..f692acd 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/CustomXmlElementBinding.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/CustomXmlElementBinding.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.modeling.ElementPropertyBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/CustomXmlListBinding.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/CustomXmlListBinding.java
index dc9c944..bdc40d9 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/CustomXmlListBinding.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/CustomXmlListBinding.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.ListPropertyBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/CustomXmlRootBinding.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/CustomXmlRootBinding.java
index 56c2d10..7d8f3e5 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/CustomXmlRootBinding.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/CustomXmlRootBinding.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.modeling.xml.RootElementController;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/CustomXmlValueBinding.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/CustomXmlValueBinding.java
index ae27f1c..c5cb79f 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/CustomXmlValueBinding.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/CustomXmlValueBinding.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.ValuePropertyBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlBinding.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlBinding.java
index f219a9d..7fd9813 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlBinding.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlBinding.java
@@ -18,7 +18,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:kamesh.sampath@accenture.com">Kamesh Sampath</a> 
  */
 
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlDocumentType.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlDocumentType.java
index e4220bc..6e6eb8e 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlDocumentType.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlDocumentType.java
@@ -21,7 +21,7 @@
  * systemId &gt; to the XML documents that uses the DTD schema for validation
  * 
  * @author <a href="mailto:kamesh.sampath@accenture.com">Kamesh Sampath</a>
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlElementBinding.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlElementBinding.java
index a74f856..202ab05 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlElementBinding.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlElementBinding.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlListBinding.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlListBinding.java
index 89428de..e31d7a2 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlListBinding.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlListBinding.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlNamespace.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlNamespace.java
index 8bf909d..a2d0fa4 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlNamespace.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlNamespace.java
@@ -18,7 +18,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlNamespaces.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlNamespaces.java
index 0e0c529..c662fc8 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlNamespaces.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlNamespaces.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlSchema.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlSchema.java
index fdbf1ef..0c415ec 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlSchema.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlSchema.java
@@ -22,7 +22,7 @@
  * Defines the location of the XML Schema for a given namespace.
  * 
  * @author <a href="mailto:kamesh.sampath@accenture.com">Kamesh Sampath</a>
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlSchemas.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlSchemas.java
index 47cd772..93f263c 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlSchemas.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlSchemas.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlValueBinding.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlValueBinding.java
index 1dc10e4..dae72a0 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlValueBinding.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/annotations/XmlValueBinding.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/dtd/DtdParser.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/dtd/DtdParser.java
index 490bc4d..d70efd5 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/dtd/DtdParser.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/dtd/DtdParser.java
@@ -27,7 +27,7 @@
 /**
  * Parses a DTD into XmlDocumentSchema representation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class DtdParser
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/DocumentTypeRootElementController.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/DocumentTypeRootElementController.java
index c86108d..7dbe94c 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/DocumentTypeRootElementController.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/DocumentTypeRootElementController.java
@@ -28,7 +28,7 @@
  * configured via the @XmlDocumentType annotation.
  * 
  * @author <a href="mailto:kamesh.sampath@accenture.com">Kamesh Sampath</a>
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class DocumentTypeRootElementController extends RootElementController {
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/ModelElementToDomDocumentConversionService.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/ModelElementToDomDocumentConversionService.java
index 759c8f9..cc9694b 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/ModelElementToDomDocumentConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/ModelElementToDomDocumentConversionService.java
@@ -21,7 +21,7 @@
 /**
  * ConversionService implementation for ModelElement to DOM Document conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ModelElementToDomDocumentConversionService extends ConversionService<ElementImpl,Document>
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/ModelElementToDomElementConversionService.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/ModelElementToDomElementConversionService.java
index 3b64fd2..e8935d4 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/ModelElementToDomElementConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/ModelElementToDomElementConversionService.java
@@ -21,7 +21,7 @@
 /**
  * ConversionService implementation for ModelElement to DOM Element conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ModelElementToDomElementConversionService extends ConversionService<ElementImpl,Element>
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/ModelElementToXmlElementConversionService.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/ModelElementToXmlElementConversionService.java
index 2186e9d..57245d3 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/ModelElementToXmlElementConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/ModelElementToXmlElementConversionService.java
@@ -20,7 +20,7 @@
 /**
  * ConversionService implementation for ModelElement to XmlElement conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ModelElementToXmlElementConversionService extends ConversionService<ElementImpl,XmlElement>
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/ObjectToRootXmlResourceConversionService.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/ObjectToRootXmlResourceConversionService.java
index 6c87afd..3c779d2 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/ObjectToRootXmlResourceConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/ObjectToRootXmlResourceConversionService.java
@@ -27,7 +27,7 @@
  * object can be converted to ByteArrayResourceStore and if the resource store corresponds to a file with "xml" 
  * extension or if the context element type has XML binding annotations.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ObjectToRootXmlResourceConversionService extends ConversionService<Object,RootXmlResource>
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/XmlResourceToDomDocumentConversionService.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/XmlResourceToDomDocumentConversionService.java
index cd41806..a288782 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/XmlResourceToDomDocumentConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/XmlResourceToDomDocumentConversionService.java
@@ -19,7 +19,7 @@
 /**
  * ConversionService implementation for XmlResource to DOM Document conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class XmlResourceToDomDocumentConversionService extends ConversionService<XmlResource,Document>
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/XmlResourceToDomElementConversionService.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/XmlResourceToDomElementConversionService.java
index 3bc339e..f1467a7 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/XmlResourceToDomElementConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/XmlResourceToDomElementConversionService.java
@@ -19,7 +19,7 @@
 /**
  * ConversionService implementation for XmlResource to DOM Element conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class XmlResourceToDomElementConversionService extends ConversionService<XmlResource,Element>
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/XmlResourceToXmlElementConversionService.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/XmlResourceToXmlElementConversionService.java
index d29b958..16203b7 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/XmlResourceToXmlElementConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/internal/XmlResourceToXmlElementConversionService.java
@@ -18,7 +18,7 @@
 /**
  * ConversionService implementation for XmlResource to XmlElement conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class XmlResourceToXmlElementConversionService extends ConversionService<XmlResource,XmlElement>
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlAllGroup.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlAllGroup.java
index b85d9a5..1df7f8d 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlAllGroup.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlAllGroup.java
@@ -20,7 +20,7 @@
 import org.w3c.dom.NodeList;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:ling.hao@oracle.com">Ling Hao</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlChoiceGroup.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlChoiceGroup.java
index c501ad2..8ef7bd9 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlChoiceGroup.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlChoiceGroup.java
@@ -20,7 +20,7 @@
 import org.w3c.dom.NodeList;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class XmlChoiceGroup extends XmlGroupContentModel
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlContentModel.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlContentModel.java
index 322af56..f5d246b 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlContentModel.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlContentModel.java
@@ -16,7 +16,7 @@
 import org.w3c.dom.NodeList;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class XmlContentModel
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlContentModelReference.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlContentModelReference.java
index e9a3c26..dc24fe3 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlContentModelReference.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlContentModelReference.java
@@ -18,7 +18,7 @@
 import org.w3c.dom.NodeList;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class XmlContentModelReference extends XmlContentModel
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlDocumentSchema.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlDocumentSchema.java
index 14486ff..0cb31f3 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlDocumentSchema.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlDocumentSchema.java
@@ -22,7 +22,7 @@
 import javax.xml.namespace.QName;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class XmlDocumentSchema
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlDocumentSchemaParser.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlDocumentSchemaParser.java
index 74951a7..c1a7208 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlDocumentSchemaParser.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlDocumentSchemaParser.java
@@ -44,7 +44,7 @@
 /**
  * Parses an XML Schema into XmlDocumentSchema representation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:ling.hao@oracle.com">Ling Hao</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlDocumentSchemasCache.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlDocumentSchemasCache.java
index 72dbf77..b1014ba 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlDocumentSchemasCache.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlDocumentSchemasCache.java
@@ -24,7 +24,7 @@
 import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @SuppressWarnings( "restriction" )
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlElementDefinition.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlElementDefinition.java
index 8c44744..5aa1e0a 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlElementDefinition.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlElementDefinition.java
@@ -22,7 +22,7 @@
 import org.w3c.dom.NodeList;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class XmlElementDefinition extends XmlContentModel
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlElementDefinitionByReference.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlElementDefinitionByReference.java
index e58dacb..f7b397a 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlElementDefinitionByReference.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlElementDefinitionByReference.java
@@ -17,7 +17,7 @@
 import javax.xml.namespace.QName;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class XmlElementDefinitionByReference extends XmlElementDefinition
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlGroupContentModel.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlGroupContentModel.java
index c30dee7..81c46bf 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlGroupContentModel.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlGroupContentModel.java
@@ -18,7 +18,7 @@
 import javax.xml.namespace.QName;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class XmlGroupContentModel extends XmlContentModel
diff --git a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlSequenceGroup.java b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlSequenceGroup.java
index e4e4a1e..5a1c4d4 100644
--- a/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlSequenceGroup.java
+++ b/plugins/org.eclipse.sapphire.modeling.xml/src/org/eclipse/sapphire/modeling/xml/schema/XmlSequenceGroup.java
@@ -19,7 +19,7 @@
 import org.w3c.dom.NodeList;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class XmlSequenceGroup extends XmlGroupContentModel
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Collation.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Collation.java
index 74ba200..39d3a5a 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Collation.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Collation.java
@@ -20,7 +20,7 @@
  * Specifies how property values should be sorted and matched. If more flexibility is needed,
  * {@link CollationService} can be implemented instead.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/CollationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/CollationService.java
index ee9e893..ae6cd0b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/CollationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/CollationService.java
@@ -19,7 +19,7 @@
  * Provides a comparator that can be used for sorting or matching string values. Most frequently specified
  * via @{@link Collation} annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class CollationService extends DataService<Comparator<String>>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Color.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Color.java
index 15fe53a..abb4d2b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Color.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Color.java
@@ -19,7 +19,7 @@
  * A representation of an RGB color.
  * 
  * @author <a href="mailto:shenxue.zhou@oracle.com">Shenxue Zhou</a>
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class Color 
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Context.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Context.java
index 1150f0a..c914185 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Context.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Context.java
@@ -19,7 +19,7 @@
  * An abstraction for finding classes and other resources typically loaded from a class loader.
  * This abstraction allows integration with systems that do not provide easy access to a class loader.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class Context
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ConversionException.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ConversionException.java
index 32e029f..6bdb714 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ConversionException.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ConversionException.java
@@ -15,7 +15,7 @@
  * Thrown if a ConversionService implementation determines that a given input cannot be converted and no other
  * implementation should be tried.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class ConversionException extends RuntimeException
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ConversionService.java
index 4e53e82..63161e6 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ConversionService.java
@@ -16,7 +16,7 @@
 /**
  * Converts an object to the specified type.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class ConversionService<S,T> extends Service
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Counter.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Counter.java
index dd32939..6ebc8ae 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Counter.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Counter.java
@@ -21,7 +21,7 @@
  * <p>A counter can be created and used directly or through the supplied static methods that work with a collection 

  * of global counters.</p>

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class Counter

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/DefaultValueService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/DefaultValueService.java
index a347666..7df772c 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/DefaultValueService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/DefaultValueService.java
@@ -14,7 +14,7 @@
 import org.eclipse.sapphire.services.DataService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class DefaultValueService extends DataService<String>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/DerivedValueService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/DerivedValueService.java
index 9941d20..a6ddc47 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/DerivedValueService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/DerivedValueService.java
@@ -14,7 +14,7 @@
 import org.eclipse.sapphire.services.DataService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class DerivedValueService extends DataService<String>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Disposable.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Disposable.java
index 1bddfd7..196f1af 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Disposable.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Disposable.java
@@ -14,7 +14,7 @@
 /**
  * Implemented if an object must be disposed when no longer needed.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface Disposable
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/DisposeEvent.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/DisposeEvent.java
index 59a5686..0113266 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/DisposeEvent.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/DisposeEvent.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class DisposeEvent extends Event
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Element.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Element.java
index c770c85..6a93df1 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Element.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Element.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.services.Service;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:shenxue.zhou@oracle.com">Shenxue Zhou</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementData.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementData.java
index b8db004..d7ceb09 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementData.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementData.java
@@ -21,7 +21,7 @@
  * adding it to a model (at least not immediately). 

  * 

  * @since 8.1

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class ElementData

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementHandle.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementHandle.java
index c387f60..9fadcf9 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementHandle.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementHandle.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.modeling.ModelPath.TypeFilterSegment;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ElementHandle<T extends Element> extends Property
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementImpl.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementImpl.java
index 5519476..48946cc 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementImpl.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementImpl.java
@@ -41,7 +41,7 @@
 import org.eclipse.sapphire.util.SortedSetFactory;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:gregory.amerson@liferay.com">Gregory Amerson</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementList.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementList.java
index c5dd22f..140fd0e 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementList.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementList.java
@@ -30,7 +30,7 @@
 import org.eclipse.sapphire.util.HashCodeFactory;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ElementList<T extends Element> extends Property implements List<T>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementProperty.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementProperty.java
index c320093..79e6e11 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementProperty.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementProperty.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class ElementProperty extends PropertyDef
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementReference.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementReference.java
index e1bda6e..b0ed571 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementReference.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementReference.java
@@ -23,7 +23,7 @@
  * 
  * <p>A PossibleValuesService implementation is automatically provided when this annotation is used.</p>
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementReferenceService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementReferenceService.java
index 7a6b4bc..ef505a3 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementReferenceService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementReferenceService.java
@@ -43,7 +43,7 @@
  * 
  * <p>A PossibleValuesService implementation is automatically provided when this service is implemented.</p>
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class ElementReferenceService extends ReferenceService<Element>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementType.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementType.java
index 69836ac..9174ef0 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementType.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ElementType.java
@@ -39,7 +39,7 @@
 import org.eclipse.sapphire.util.SortedSetFactory;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:kamesh.sampath@accenture.com">Kamesh Sampath</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/EnablementService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/EnablementService.java
index b395ddb..a3646ee 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/EnablementService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/EnablementService.java
@@ -14,7 +14,7 @@
 import org.eclipse.sapphire.services.DataService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class EnablementService extends DataService<Boolean>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Event.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Event.java
index 9411494..d381a12 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Event.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Event.java
@@ -17,7 +17,7 @@
 import java.util.Map;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class Event
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/EventDeliveryJob.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/EventDeliveryJob.java
index f56182b..d05a987 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/EventDeliveryJob.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/EventDeliveryJob.java
@@ -14,7 +14,7 @@
 /**

  * Used by {@link ListenerContext} to deliver an {@link Event} to a {@link Listener} through a {@link JobQueue}.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class EventDeliveryJob implements Runnable

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ExecutableElement.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ExecutableElement.java
index ba8af08..f81079f 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ExecutableElement.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ExecutableElement.java
@@ -15,7 +15,7 @@
 import org.eclipse.sapphire.modeling.Status;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface ExecutableElement extends Element
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/FileName.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/FileName.java
index c734e27..b014fb4 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/FileName.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/FileName.java
@@ -42,7 +42,7 @@
  *   

  * </ol>

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class FileName implements Comparable<FileName>

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/FileUtil.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/FileUtil.java
index d685790..76a0d78 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/FileUtil.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/FileUtil.java
@@ -15,7 +15,7 @@
 import java.io.IOException;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class FileUtil
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Filter.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Filter.java
index f15d693..420f0dc 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Filter.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Filter.java
@@ -14,7 +14,7 @@
 /**
  * Generic filter interface that can be parameterized for different element types.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface Filter<E>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/FilteredListener.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/FilteredListener.java
index f5bbcc8..88434fa 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/FilteredListener.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/FilteredListener.java
@@ -15,7 +15,7 @@
 import java.lang.reflect.Type;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class FilteredListener<T extends Event> extends Listener
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ImageData.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ImageData.java
index 470d3d1..eb02a6f 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ImageData.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ImageData.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.modeling.BinaryData;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ImageData extends BinaryData
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ImageService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ImageService.java
index 8e7351a..fba91a7 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ImageService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ImageService.java
@@ -14,7 +14,7 @@
 import org.eclipse.sapphire.services.DataService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class ImageService extends DataService<ImageData>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ImpliedElementProperty.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ImpliedElementProperty.java
index cbb3ec5..4cb28de 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ImpliedElementProperty.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ImpliedElementProperty.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ImpliedElementProperty extends ElementProperty
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Index.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Index.java
index 607da0b..d6574c1 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Index.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Index.java
@@ -28,7 +28,7 @@
  * 
  * <p>To create an index, use the {@link ElementList#index(ValueProperty)} method.</p>
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class Index<T extends Element>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/InitialValueService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/InitialValueService.java
index a6be21a..0a0f40b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/InitialValueService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/InitialValueService.java
@@ -17,7 +17,7 @@
 /**
  * Produces a value to assign to a property when the containing model element is created.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:kamesh.sampath@accenture.com">Kamesh Sampath</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/JobQueue.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/JobQueue.java
index 5732939..d2107b3 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/JobQueue.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/JobQueue.java
@@ -24,7 +24,7 @@
  * <p>Used by {@link ListenerContext} to deliver events to listeners. A single {@link JobQueue} can be shared by multiple
  * {@link ListenerContext} instances in order to synchronize event delivery.</p>
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class JobQueue<T extends Runnable>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/LayeredListPropertyBinding.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/LayeredListPropertyBinding.java
index 2b6f34b..0db2c8b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/LayeredListPropertyBinding.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/LayeredListPropertyBinding.java
@@ -17,7 +17,7 @@
 import org.eclipse.sapphire.util.ListFactory;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class LayeredListPropertyBinding extends ListPropertyBinding
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Length.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Length.java
index d5bc1aa..d3ef118 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Length.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Length.java
@@ -19,7 +19,7 @@
 /**

  * Specifies text length constraints for a value property or item count constraints for a list property.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  * @since 8.2

  */

 

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ListProperty.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ListProperty.java
index 9e0a91b..65471ca 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ListProperty.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ListProperty.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ListProperty extends PropertyDef
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ListPropertyBinding.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ListPropertyBinding.java
index 7b744f8..90670bc 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ListPropertyBinding.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ListPropertyBinding.java
@@ -14,7 +14,7 @@
 import java.util.List;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class ListPropertyBinding extends PropertyBinding
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Listener.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Listener.java
index fc2c438..200c6b3 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Listener.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Listener.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class Listener
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ListenerContext.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ListenerContext.java
index c5b5563..4b4cd80 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ListenerContext.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ListenerContext.java
@@ -15,7 +15,7 @@
 import java.util.Set;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ListenerContext
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/LocalizableText.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/LocalizableText.java
index 75642d4..90f8b93 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/LocalizableText.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/LocalizableText.java
@@ -80,7 +80,7 @@
  *   <li>@Text annotation on the field</li>
  * </ol>
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class LocalizableText
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/LoggingService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/LoggingService.java
index 5c34d0d..ff40017 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/LoggingService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/LoggingService.java
@@ -17,7 +17,7 @@
 /**
  * Used to log messages and exceptions relating to system operation.
  * 
- * @author <a href="konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class LoggingService extends Service
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/MasterConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/MasterConversionService.java
index a5874b4..7f82411 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/MasterConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/MasterConversionService.java
@@ -20,7 +20,7 @@
  * <p>An implementation of this service is provided with Sapphire. This service is not intended to
  * be implemented by adopters.</p>
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class MasterConversionService extends Service
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/MasterVersionCompatibilityService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/MasterVersionCompatibilityService.java
index f88e85a..cb6251f 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/MasterVersionCompatibilityService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/MasterVersionCompatibilityService.java
@@ -23,7 +23,7 @@
  * <p>An implementation of this service is provided with Sapphire. This service is not intended to

  * be implemented by adopters.</p>

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class MasterVersionCompatibilityService extends DataService<Data>

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Observable.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Observable.java
index 4f53f5e..744fd73 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Observable.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Observable.java
@@ -14,7 +14,7 @@
 /**

  * An entity that supports listeners.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public interface Observable

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ObservableList.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ObservableList.java
index a5b416f..8a631ac 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ObservableList.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ObservableList.java
@@ -20,7 +20,7 @@
 /**

  * An implementation of {@link List} that is {@link Observable} using listeners.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class ObservableList<E> extends AbstractList<E> implements Observable

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ObservableMap.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ObservableMap.java
index b483365..ee4bca8 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ObservableMap.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ObservableMap.java
@@ -21,7 +21,7 @@
 /**

  * An implementation of {@link Map} that is {@link Observable} using listeners.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class ObservableMap<K,V> extends AbstractMap<K,V> implements Observable

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ObservableSet.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ObservableSet.java
index c4819d7..2e7202b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ObservableSet.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ObservableSet.java
@@ -19,7 +19,7 @@
 /**

  * An implementation of {@link Set} that is {@link Observable} using listeners.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class ObservableSet<E> implements Set<E>, Observable

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PossibleTypesService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PossibleTypesService.java
index a8637e1..bc908e0 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PossibleTypesService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PossibleTypesService.java
@@ -25,7 +25,7 @@
  * Enumerates the possible child element types for a list or an element property. Each 
  * returned type is required to derive from the property's base type.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class PossibleTypesService extends DataService<Set<ElementType>>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PossibleValues.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PossibleValues.java
index 0bfa4d7..7dd745d 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PossibleValues.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PossibleValues.java
@@ -22,7 +22,7 @@
  * Specifies the possible values for a property either statically or via a reference into the model. If more
  * flexibility is needed, {@link PossibleValuesService} can be implemented instead.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PossibleValuesService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PossibleValuesService.java
index c1f47d4..c53e3a3 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PossibleValuesService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PossibleValuesService.java
@@ -29,7 +29,7 @@
 import org.eclipse.sapphire.util.SortedSetFactory;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class PossibleValuesService extends DataService<Set<String>>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PreferDefaultValue.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PreferDefaultValue.java
index 1dc075e..4359d8b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PreferDefaultValue.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PreferDefaultValue.java
@@ -21,7 +21,7 @@
  * 

  * <p><b>Applicability:</b> Value Properties</p>

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 @Retention( RetentionPolicy.RUNTIME )

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Property.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Property.java
index eaeb174..d5972d8 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Property.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Property.java
@@ -32,7 +32,7 @@
 /**

  * Represents an instance of a property within an element.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public abstract class Property implements Observable

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyBinding.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyBinding.java
index ddab2c6..6e07772 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyBinding.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyBinding.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class PropertyBinding implements Disposable
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyContentEvent.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyContentEvent.java
index b55e7aa..08bc0a0 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyContentEvent.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyContentEvent.java
@@ -14,7 +14,7 @@
 /**
  * The event that's broadcast when the content of a property changes.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class PropertyContentEvent extends PropertyEvent
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyDef.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyDef.java
index 5572048..c5e6fc0 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyDef.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyDef.java
@@ -29,7 +29,7 @@
 import org.eclipse.sapphire.util.ListFactory;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class PropertyDef extends ModelMetadataItem
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyDefaultEvent.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyDefaultEvent.java
index 04f4f43..b2f43bc 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyDefaultEvent.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyDefaultEvent.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class PropertyDefaultEvent extends PropertyContentEvent
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyEnablementEvent.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyEnablementEvent.java
index 905a832..87bdcc7 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyEnablementEvent.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyEnablementEvent.java
@@ -14,7 +14,7 @@
 import java.util.Map;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class PropertyEnablementEvent extends PropertyEvent
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyEvent.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyEvent.java
index e389470..e5368fb 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyEvent.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyEvent.java
@@ -14,7 +14,7 @@
 import java.util.Map;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class PropertyEvent extends Event
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyValidationEvent.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyValidationEvent.java
index 56fb1b6..423957f 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyValidationEvent.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyValidationEvent.java
@@ -16,7 +16,7 @@
 import org.eclipse.sapphire.modeling.Status;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class PropertyValidationEvent extends PropertyEvent
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyVisitor.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyVisitor.java
index 912092a..982cae1 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyVisitor.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/PropertyVisitor.java
@@ -14,7 +14,7 @@
 /**

  * Implemented in order to visit properties using Element.visit() method.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public abstract class PropertyVisitor

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ReferenceValue.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ReferenceValue.java
index 8664a42..a0e315c 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ReferenceValue.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ReferenceValue.java
@@ -15,7 +15,7 @@
 import org.eclipse.sapphire.services.ReferenceService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ReferenceValue<R,T> extends Value<R>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/RequiredConstraintService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/RequiredConstraintService.java
index fe74bf1..5004d90 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/RequiredConstraintService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/RequiredConstraintService.java
@@ -17,7 +17,7 @@
  * Determines whether a property is required to have content. Most frequently specified
  * via an @Required annotation. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class RequiredConstraintService extends DataService<Boolean>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Resource.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Resource.java
index 73d0b15..2743d6b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Resource.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Resource.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.modeling.localization.SourceLanguageLocalizationService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class Resource implements Disposable
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Result.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Result.java
index eea92e4..d8f7fda 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Result.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Result.java
@@ -15,7 +15,7 @@
  * A wrapper for a function result that allows the function caller to select between

  * getting a null or an exception if no data is returned.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class Result<T>

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Sapphire.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Sapphire.java
index e55b38f..dcb4d8d 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Sapphire.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Sapphire.java
@@ -23,7 +23,7 @@
 import org.eclipse.sapphire.services.ServiceContext;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class Sapphire
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Serialization.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Serialization.java
index 43b6681..3326f57 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Serialization.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Serialization.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Since.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Since.java
index 1a14d1e..0a40ee3 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Since.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Since.java
@@ -27,7 +27,7 @@
  * <p><b>Applicability:</b> Properties</p>

  * <p><b>Service:</b> VersionCompatibilityService</p>

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 @Retention( RetentionPolicy.RUNTIME )

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Suspension.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Suspension.java
index 5ba191f..0256710 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Suspension.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Suspension.java
@@ -17,7 +17,7 @@
  * 
  * <p>For instance, it is used when suspending event delivery from a property. See {@link Property#suspend()}.</p>
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class Suspension implements Disposable, AutoCloseable
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Text.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Text.java
index 88c9dbf..9f86709 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Text.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Text.java
@@ -28,7 +28,7 @@
  * <p><b>Applicability:</b> Properties, Elements</p>

  * <p><b>Service:</b> ContextVersionService</p>

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 @Retention( RetentionPolicy.RUNTIME )

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Transient.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Transient.java
index ecb9e4e..24c8fd9 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Transient.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Transient.java
@@ -14,7 +14,7 @@
 import static org.eclipse.sapphire.modeling.util.MiscUtil.equal;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class Transient<T> extends Property
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/TransientProperty.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/TransientProperty.java
index 70870f1..bbe19cc 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/TransientProperty.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/TransientProperty.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class TransientProperty extends PropertyDef
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Type.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Type.java
index 0ccc38e..7db22d4 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Type.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Type.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Unique.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Unique.java
index 9e71859..e62deed 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Unique.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Unique.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/UniversalConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/UniversalConversionService.java
index 99f1e91..7ffe38a 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/UniversalConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/UniversalConversionService.java
@@ -16,7 +16,7 @@
 /**
  * Converts an object to the specified type.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class UniversalConversionService extends Service
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Validation.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Validation.java
index e378b69..01c1247 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Validation.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Validation.java
@@ -23,7 +23,7 @@
  * Specifies a validation rule for a property or an element using Sapphire EL. Multiple rules can be specified
  * by using @{@link Validations} container.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Validations.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Validations.java
index 426fec4..3e71c2c 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Validations.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Validations.java
@@ -19,7 +19,7 @@
 /**
  * Container for multiple @{@link Validation} annotations.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Value.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Value.java
index 1000ddf..89e380f 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Value.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Value.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.services.ValueNormalizationService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class Value<T> extends Property
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ValueProperty.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ValueProperty.java
index 0b48962..efe6831 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ValueProperty.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ValueProperty.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.modeling.ValueKeyword;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ValueProperty extends PropertyDef
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ValuePropertyBinding.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ValuePropertyBinding.java
index e17d566..1834cb2 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ValuePropertyBinding.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ValuePropertyBinding.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class ValuePropertyBinding extends PropertyBinding
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ValuePropertyContentEvent.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ValuePropertyContentEvent.java
index 77e867f..e945dbf 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ValuePropertyContentEvent.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/ValuePropertyContentEvent.java
@@ -16,7 +16,7 @@
 /**
  * The event that's broadcast when the content of a value property changes.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class ValuePropertyContentEvent extends PropertyContentEvent
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Version.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Version.java
index 6630cad..01bcb8a 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Version.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/Version.java
@@ -22,7 +22,7 @@
  * Represents a version as a sequence of long integers. In string format, it is represented as a dot-separated
  * list of numeric segments, such as "1.2.3" or "5.7.3.2012070310003".
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class Version implements Comparable<Version>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/VersionCompatibility.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/VersionCompatibility.java
index 41a633d..70b973f 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/VersionCompatibility.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/VersionCompatibility.java
@@ -30,7 +30,7 @@
  * <p><b>Applicability:</b> Properties</p>

  * <p><b>Service:</b> VersionCompatibilityService</p>

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 @Retention( RetentionPolicy.RUNTIME )

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/VersionCompatibilityService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/VersionCompatibilityService.java
index 989b872..b480de1 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/VersionCompatibilityService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/VersionCompatibilityService.java
@@ -23,7 +23,7 @@
  * element, then the parent property and the parent element, etc. The search continues until version compatibility target 

  * is found or the model root is reached.</p>

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public abstract class VersionCompatibilityService extends DataService<VersionCompatibilityService.Data>

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/VersionCompatibilityTarget.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/VersionCompatibilityTarget.java
index 37d9200..063f5eb 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/VersionCompatibilityTarget.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/VersionCompatibilityTarget.java
@@ -28,7 +28,7 @@
  * <p><b>Applicability:</b> Properties, Elements</p>

  * <p><b>Service:</b> ContextVersionService</p>

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 @Retention( RetentionPolicy.RUNTIME )

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/VersionCompatibilityTargetService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/VersionCompatibilityTargetService.java
index 465f962..86e15fe 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/VersionCompatibilityTargetService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/VersionCompatibilityTargetService.java
@@ -23,7 +23,7 @@
  * element, then the parent property and the parent element, etc. The search continues until version compatibility target 

  * is found or the model root is reached.</p>

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public abstract class VersionCompatibilityTargetService extends DataService<VersionCompatibilityTargetService.Data>

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/VersionConstraint.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/VersionConstraint.java
index f393fd4..8e16cef 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/VersionConstraint.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/VersionConstraint.java
@@ -24,7 +24,7 @@
  * syntax). The square brackets indicate that the range includes the specified version. The parenthesis 
  * indicate that the range goes up to, but does not actually include the specified version.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class VersionConstraint
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DateToStringConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DateToStringConversionService.java
index acb242d..72f9aa7 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DateToStringConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DateToStringConversionService.java
@@ -20,7 +20,7 @@
 /**
  * ConversionService implementation for Date to String conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class DateToStringConversionService extends ConversionService<Date,String> 
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DateToStringConversionServiceForProperty.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DateToStringConversionServiceForProperty.java
index 648d9d7..4154d5b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DateToStringConversionServiceForProperty.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DateToStringConversionServiceForProperty.java
@@ -24,7 +24,7 @@
 /**
  * ConversionService implementation for Date to String conversions specified at property level using @Serialization annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class DateToStringConversionServiceForProperty extends ConversionService<Date,String> 
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeCollationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeCollationService.java
index f22fa68..15f9e6b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeCollationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeCollationService.java
@@ -35,7 +35,7 @@
 /**
  * A {@link CollationService} implementation that derives its behavior from @{@link Collation} annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class DeclarativeCollationService extends CollationService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeElementReferenceService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeElementReferenceService.java
index 0f8a9f3..e3c7bf3 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeElementReferenceService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeElementReferenceService.java
@@ -24,7 +24,7 @@
  * {@link org.eclipse.sapphire.services.ReferenceService} implementation that derives its behavior 
  * from @{@link ElementReference} annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class DeclarativeElementReferenceService extends ElementReferenceService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeRequiredConstraintService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeRequiredConstraintService.java
index db635e7..f16d06c 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeRequiredConstraintService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeRequiredConstraintService.java
@@ -34,7 +34,7 @@
 /**
  * {@link RequiredConstraintService} implementation that derives its behavior from @{@link Required} annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class DeclarativeRequiredConstraintService extends RequiredConstraintService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeValidationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeValidationService.java
index 06d6847..6f7c1eb 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeValidationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeValidationService.java
@@ -37,7 +37,7 @@
 /**
  * {@link ValidationService} implementation that derives its behavior from @{@link Validation} annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class DeclarativeValidationService extends ValidationService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeVersionCompatibilityService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeVersionCompatibilityService.java
index ce05b2f..2c01c8b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeVersionCompatibilityService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeVersionCompatibilityService.java
@@ -37,7 +37,7 @@
 /**

  * Implementation of VersionCompatibilityService that derives its behavior from @VersionCompatibility and @Since annotations.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class DeclarativeVersionCompatibilityService extends VersionCompatibilityService

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeVersionCompatibilityTargetService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeVersionCompatibilityTargetService.java
index 702521f..5425d44 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeVersionCompatibilityTargetService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DeclarativeVersionCompatibilityTargetService.java
@@ -33,7 +33,7 @@
 /**

  * Implementation of VersionCompatibilityTargetService that derives its behavior from @VersionCompatibilityTarget annotation.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class DeclarativeVersionCompatibilityTargetService extends VersionCompatibilityTargetService

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DefaultCollationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DefaultCollationService.java
index dc93ba7..c79c851 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DefaultCollationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DefaultCollationService.java
@@ -22,7 +22,7 @@
  * A {@link CollationService} implementation that is active when an explicit collation is not specified. The provided
  * collation matches Java's default string comparison. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class DefaultCollationService extends CollationService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DefaultValueLabelService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DefaultValueLabelService.java
index 679f5c5..c4105b8 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DefaultValueLabelService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/DefaultValueLabelService.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.services.ValueLabelService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class DefaultValueLabelService extends ValueLabelService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ElementClassLoader.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ElementClassLoader.java
index cac98b5..9f00ea1 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ElementClassLoader.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ElementClassLoader.java
@@ -14,7 +14,7 @@
 import org.eclipse.sapphire.ElementType;

 

 /**

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class ElementClassLoader extends ClassLoader

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ElementClassLoaders.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ElementClassLoaders.java
index 3009b0e..0f6a3ee 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ElementClassLoaders.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ElementClassLoaders.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.ElementType;

 

 /**

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class ElementClassLoaders

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ElementCompiler.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ElementCompiler.java
index bdbedf0..adfe8e9 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ElementCompiler.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ElementCompiler.java
@@ -60,7 +60,7 @@
 import org.objectweb.asm.Type;

 

 /**

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class ElementCompiler

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ElementReferencePossibleValuesService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ElementReferencePossibleValuesService.java
index 3608e16..8a5e258 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ElementReferencePossibleValuesService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ElementReferencePossibleValuesService.java
@@ -31,7 +31,7 @@
 /**
  * {@link PossibleValuesService} implementation that derives its behavior from {@link ElementReferenceService}.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ElementReferencePossibleValuesService extends PossibleValuesService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/EnumPossibleValuesService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/EnumPossibleValuesService.java
index b9d1a1b..52961ab 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/EnumPossibleValuesService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/EnumPossibleValuesService.java
@@ -25,7 +25,7 @@
 import org.eclipse.sapphire.services.ServiceContext;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class EnumPossibleValuesService extends PossibleValuesService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/EnumToStringConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/EnumToStringConversionService.java
index af23fb5..8b53272 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/EnumToStringConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/EnumToStringConversionService.java
@@ -18,7 +18,7 @@
 /**
  * ConversionService implementation for Enum to String conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @SuppressWarnings( "rawtypes" )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/EnumValueLabelService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/EnumValueLabelService.java
index 6d16c91..81c8bb9 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/EnumValueLabelService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/EnumValueLabelService.java
@@ -20,7 +20,7 @@
 import org.eclipse.sapphire.services.ValueLabelService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class EnumValueLabelService extends ValueLabelService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/FileNameNormalizationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/FileNameNormalizationService.java
index 2c4aae2..5409c9b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/FileNameNormalizationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/FileNameNormalizationService.java
@@ -37,7 +37,7 @@
  *   

  * </ol>

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class FileNameNormalizationService extends ValueNormalizationService

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/FunctionBasedEnablementService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/FunctionBasedEnablementService.java
index c5337fe..b781c29 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/FunctionBasedEnablementService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/FunctionBasedEnablementService.java
@@ -32,7 +32,7 @@
 import org.eclipse.sapphire.services.ServiceContext;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class FunctionBasedEnablementService extends EnablementService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/LengthFactsServiceForList.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/LengthFactsServiceForList.java
index ee5ee71..95783c4 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/LengthFactsServiceForList.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/LengthFactsServiceForList.java
@@ -26,7 +26,7 @@
  * An implementation of FactsService that creates fact statements about a list property's item count

  * constraints by using the semantical information specified by the @Length annotation.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class LengthFactsServiceForList extends FactsService

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/LengthFactsServiceForValue.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/LengthFactsServiceForValue.java
index 0ff0c0a..1345565 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/LengthFactsServiceForValue.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/LengthFactsServiceForValue.java
@@ -26,7 +26,7 @@
  * An implementation of FactsService that creates fact statements about a value property's text length

  * constraints by using the semantical information specified by the @Length annotation.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class LengthFactsServiceForValue extends FactsService

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/LengthValidationServiceForList.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/LengthValidationServiceForList.java
index f552804..00f6478 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/LengthValidationServiceForList.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/LengthValidationServiceForList.java
@@ -28,7 +28,7 @@
  * An implementation of ValidationService that produces a validation error when a list property's item count

  * is outside of the constraints specified by the @Length annotation.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class LengthValidationServiceForList extends ValidationService

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/LengthValidationServiceForValue.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/LengthValidationServiceForValue.java
index 05abbf2..1b508a1 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/LengthValidationServiceForValue.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/LengthValidationServiceForValue.java
@@ -27,7 +27,7 @@
  * An implementation of ValidationService that produces a validation error when a value property's text length
  * is outside of the constraints specified by the @Length annotation.
 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class LengthValidationServiceForValue extends ValidationService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ListFromValueCollationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ListFromValueCollationService.java
index fe3e191..53ef2b0 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ListFromValueCollationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ListFromValueCollationService.java
@@ -31,7 +31,7 @@
  * of list member's value property. This service implementation will only activate if the list property has 
  * one possible type, and that type has a single property, and that property is a value property. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ListFromValueCollationService extends CollationService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ListFromValuePossibleValuesService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ListFromValuePossibleValuesService.java
index d8c4473..4200bc0 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ListFromValuePossibleValuesService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ListFromValuePossibleValuesService.java
@@ -34,7 +34,7 @@
  * one possible type, and that type has a single property, and that property is a value property,
  * and that value property has a PossibleValuesService implementation in the property metamodel context. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ListFromValuePossibleValuesService extends PossibleValuesService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ModelBasedPossibleValuesService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ModelBasedPossibleValuesService.java
index 3c8dace..327058c 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ModelBasedPossibleValuesService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ModelBasedPossibleValuesService.java
@@ -33,7 +33,7 @@
 /**
  * {@link PossibleValuesService} implementation that derives its behavior from @{@link PossibleValues} annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:gregory.amerson@liferay.com">Gregory Amerson</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/NonSuspendableListener.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/NonSuspendableListener.java
index d3afd5d..d0d5f19 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/NonSuspendableListener.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/NonSuspendableListener.java
@@ -14,7 +14,7 @@
 /**
  * Marker interface for listeners that should continue to receive events when event deliver to other listeners is suspended.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface NonSuspendableListener
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ObjectToStringConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ObjectToStringConversionService.java
index 2a2d50c..4994b23 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ObjectToStringConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ObjectToStringConversionService.java
@@ -16,7 +16,7 @@
 /**
  * ConversionService implementation for Object to String conversions that uses object's toString() method.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ObjectToStringConversionService extends ConversionService<Object,String>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ParentBasedEnablementService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ParentBasedEnablementService.java
index f5e3f13..7cd67a6 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ParentBasedEnablementService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ParentBasedEnablementService.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.services.ServiceContext;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ParentBasedEnablementService extends EnablementService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ParentBasedVersionCompatibilityService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ParentBasedVersionCompatibilityService.java
index 085c6b0..e64dc29 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ParentBasedVersionCompatibilityService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ParentBasedVersionCompatibilityService.java
@@ -24,7 +24,7 @@
  * Implementation of VersionCompatibilityService that derives its behavior from version compatibility of the containing

  * element's parent property.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class ParentBasedVersionCompatibilityService extends VersionCompatibilityService

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/PreferDefaultValueFactsService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/PreferDefaultValueFactsService.java
index 99244a3..7afce03 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/PreferDefaultValueFactsService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/PreferDefaultValueFactsService.java
@@ -26,7 +26,7 @@
  * Creates fact statements about property's recommended value by using semantical information specified 
  * by @PreferDefaultValue annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class PreferDefaultValueFactsService extends FactsService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/PreferDefaultValueValidationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/PreferDefaultValueValidationService.java
index 74fcb70..c64b5d7 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/PreferDefaultValueValidationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/PreferDefaultValueValidationService.java
@@ -27,7 +27,7 @@
 import org.eclipse.sapphire.services.ValidationService;

 

 /**

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class PreferDefaultValueValidationService extends ValidationService

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/RequiredConstraintFactsService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/RequiredConstraintFactsService.java
index 709de6d..2731264 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/RequiredConstraintFactsService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/RequiredConstraintFactsService.java
@@ -28,7 +28,7 @@
  * {@link FactsService} implementation that contributes fact statements based on semantical
  * information from {@link RequiredConstraintService}.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class RequiredConstraintFactsService extends FactsService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/RequiredConstraintValidationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/RequiredConstraintValidationService.java
index 0306109..1770265 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/RequiredConstraintValidationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/RequiredConstraintValidationService.java
@@ -26,7 +26,7 @@
 import org.eclipse.sapphire.services.ValidationService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class RequiredConstraintValidationService extends ValidationService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/SerializationFactsService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/SerializationFactsService.java
index 087fd94..68a6040 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/SerializationFactsService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/SerializationFactsService.java
@@ -25,7 +25,7 @@
  * Creates fact statements about property's serialization by using semantical information specified by
  * the @Serialization annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class SerializationFactsService extends FactsService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StandardDefaultValueService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StandardDefaultValueService.java
index 49c3987..4b16fb2 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StandardDefaultValueService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StandardDefaultValueService.java
@@ -31,7 +31,7 @@
 /**
  * Implementation of {@link DefaultValueService} that draws the default value from @{@link DefaultValue} annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StandardDefaultValueService extends DefaultValueService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StandardDerivedValueService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StandardDerivedValueService.java
index 35daee3..fdd5b4f 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StandardDerivedValueService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StandardDerivedValueService.java
@@ -29,7 +29,7 @@
 import org.eclipse.sapphire.services.ServiceContext;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StandardDerivedValueService extends DerivedValueService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StandardInitialValueService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StandardInitialValueService.java
index 7618070..2638039 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StandardInitialValueService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StandardInitialValueService.java
@@ -32,7 +32,7 @@
 /**
  * Implementation of {@link InitialValueService} that draws the initial value from @{@link InitialValue} annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:kamesh.sampath@accenture.com">Kamesh Sampath</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StandardLoggingService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StandardLoggingService.java
index edbcdf0..89a3000 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StandardLoggingService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StandardLoggingService.java
@@ -17,7 +17,7 @@
 /**
  * Implementation of LoggingService that writes to system error stream. 
  * 
- * @author <a href="konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StandardLoggingService extends LoggingService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StandardPossibleTypesService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StandardPossibleTypesService.java
index 2649457..086a46e 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StandardPossibleTypesService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StandardPossibleTypesService.java
@@ -23,7 +23,7 @@
 /**
  * Implementation of PossibleTypesService using information specified by @Type annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StandardPossibleTypesService extends PossibleTypesService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StaticImageService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StaticImageService.java
index f8b750e..e33bd30 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StaticImageService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StaticImageService.java
@@ -24,7 +24,7 @@
 import org.eclipse.sapphire.services.ServiceContext;
 
 /**
- * @author <a href="konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StaticImageService extends ImageService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StaticPossibleValuesService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StaticPossibleValuesService.java
index cb16690..438affc 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StaticPossibleValuesService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StaticPossibleValuesService.java
@@ -25,7 +25,7 @@
 /**
  * Implementation of PossibleValuesService based on @PossibleValues annotation's values attribute..
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StaticPossibleValuesService extends PossibleValuesService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToBigDecimalConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToBigDecimalConversionService.java
index 829cbf5..408520a 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToBigDecimalConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToBigDecimalConversionService.java
@@ -18,7 +18,7 @@
 /**
  * ConversionService implementation for String to BigDecimal conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToBigDecimalConversionService extends ConversionService<String,BigDecimal>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToBigIntegerConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToBigIntegerConversionService.java
index 2df45db..7dfe922 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToBigIntegerConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToBigIntegerConversionService.java
@@ -18,7 +18,7 @@
 /**
  * ConversionService implementation for String to BigInteger conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToBigIntegerConversionService extends ConversionService<String,BigInteger>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToBooleanConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToBooleanConversionService.java
index fcd07d3..88e0a82 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToBooleanConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToBooleanConversionService.java
@@ -16,7 +16,7 @@
 /**
  * ConversionService implementation for String to Boolean conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToBooleanConversionService extends ConversionService<String,Boolean>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToByteConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToByteConversionService.java
index 4798ecf..5698e66 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToByteConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToByteConversionService.java
@@ -16,7 +16,7 @@
 /**
  * ConversionService implementation for String to Byte conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToByteConversionService extends ConversionService<String,Byte>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToColorConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToColorConversionService.java
index f443408..05391b9 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToColorConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToColorConversionService.java
@@ -22,7 +22,7 @@
  * ConversionService implementation for String to Color conversions.
  * 
  * @author <a href="mailto:shenxue.zhou@oracle.com">Shenxue Zhou</a>
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToColorConversionService extends ConversionService<String,Color>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToDateConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToDateConversionService.java
index 2bd34b0..e923f1f 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToDateConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToDateConversionService.java
@@ -26,7 +26,7 @@
  * ConversionService implementation for String to Date conversions.
  * 
  * @author <a href="marcelo.paternostro@oracle.com">Marcelo Paternostro</a>
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToDateConversionService extends ConversionService<String,Date> 
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToDateConversionServiceForProperty.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToDateConversionServiceForProperty.java
index 3dd4974..a30070d 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToDateConversionServiceForProperty.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToDateConversionServiceForProperty.java
@@ -28,7 +28,7 @@
 /**
  * ConversionService implementation for String to Date conversions specified at property level using @Serialization annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToDateConversionServiceForProperty extends ConversionService<String,Date> 
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToDoubleConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToDoubleConversionService.java
index e3b8c96..4b0988b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToDoubleConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToDoubleConversionService.java
@@ -16,7 +16,7 @@
 /**
  * ConversionService implementation for String to Double conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToDoubleConversionService extends ConversionService<String,Double>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToEnumConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToEnumConversionService.java
index 224eeb9..751723e 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToEnumConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToEnumConversionService.java
@@ -18,7 +18,7 @@
 /**
  * ConversionService implementation for String to Enum conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToEnumConversionService extends UniversalConversionService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToFileNameConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToFileNameConversionService.java
index 2191024..bf61bdf 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToFileNameConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToFileNameConversionService.java
@@ -17,7 +17,7 @@
 /**
  * ConversionService implementation for String to FileName conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToFileNameConversionService extends ConversionService<String,FileName>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToFloatConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToFloatConversionService.java
index 42e8785..bcead65 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToFloatConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToFloatConversionService.java
@@ -16,7 +16,7 @@
 /**
  * ConversionService implementation for String to Float conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToFloatConversionService extends ConversionService<String,Float>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToFunctionConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToFunctionConversionService.java
index fc9d8d1..5d9e507 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToFunctionConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToFunctionConversionService.java
@@ -19,7 +19,7 @@
 /**
  * ConversionService implementation for String to Function conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToFunctionConversionService extends ConversionService<String,Function>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToIntegerConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToIntegerConversionService.java
index 4070e65..7fccf67 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToIntegerConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToIntegerConversionService.java
@@ -16,7 +16,7 @@
 /**
  * ConversionService implementation for String to Integer conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToIntegerConversionService extends ConversionService<String,Integer>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToLongConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToLongConversionService.java
index 0670b8c..4cb23a4 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToLongConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToLongConversionService.java
@@ -16,7 +16,7 @@
 /**
  * ConversionService implementation for String to Long conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToLongConversionService extends ConversionService<String,Long>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToPathConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToPathConversionService.java
index 054f3cc..3538573 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToPathConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToPathConversionService.java
@@ -17,7 +17,7 @@
 /**
  * ConversionService implementation for String to Path conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToPathConversionService extends ConversionService<String,Path>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToShortConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToShortConversionService.java
index 6001545..64653a7 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToShortConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToShortConversionService.java
@@ -16,7 +16,7 @@
 /**
  * ConversionService implementation for String to Short conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToShortConversionService extends ConversionService<String,Short>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToUriConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToUriConversionService.java
index a760089..d74b5d2 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToUriConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToUriConversionService.java
@@ -19,7 +19,7 @@
 /**
  * ConversionService implementation for String to URI conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToUriConversionService extends ConversionService<String,URI>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToUrlConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToUrlConversionService.java
index 709338e..f70183f 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToUrlConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToUrlConversionService.java
@@ -19,7 +19,7 @@
 /**
  * ConversionService implementation for String to URL conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToUrlConversionService extends ConversionService<String,URL>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToVersionConstraintConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToVersionConstraintConversionService.java
index 79e7599..073943f 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToVersionConstraintConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToVersionConstraintConversionService.java
@@ -17,7 +17,7 @@
 /**
  * ConversionService implementation for String to VersionConstraint conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToVersionConstraintConversionService extends ConversionService<String,VersionConstraint>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToVersionConversionService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToVersionConversionService.java
index cc5babc..fe34f6f 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToVersionConversionService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/StringToVersionConversionService.java
@@ -17,7 +17,7 @@
 /**
  * ConversionService implementation for String to Version conversions.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringToVersionConversionService extends ConversionService<String,Version>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/UniqueValueValidationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/UniqueValueValidationService.java
index 3f2bf3a..084b3b1 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/UniqueValueValidationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/UniqueValueValidationService.java
@@ -29,7 +29,7 @@
 import org.eclipse.sapphire.services.ValidationService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class UniqueValueValidationService extends ValidationService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ValueFromListPossibleValuesService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ValueFromListPossibleValuesService.java
index 37f40de..853ada0 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ValueFromListPossibleValuesService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ValueFromListPossibleValuesService.java
@@ -32,7 +32,7 @@
  * the sole property in its type, and the element is contained by a list property, and the list property has
  * a PossibleValueService implementation in the property instance context.  
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ValueFromListPossibleValuesService extends PossibleValuesService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ValueSnapshot.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ValueSnapshot.java
index d178a18..1ec34e8 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ValueSnapshot.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/ValueSnapshot.java
@@ -14,7 +14,7 @@
 import org.eclipse.sapphire.ValueProperty;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ValueSnapshot
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/VersionCompatibilityEnablementService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/VersionCompatibilityEnablementService.java
index f20d713..056af3b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/VersionCompatibilityEnablementService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/VersionCompatibilityEnablementService.java
@@ -24,7 +24,7 @@
  * Implementation of EnablementService that determines property's enablement state based on property's 

  * compatibility with the version compatibility target.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class VersionCompatibilityEnablementService extends EnablementService

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/VersionCompatibilityFactsService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/VersionCompatibilityFactsService.java
index d472467..8a3e16f 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/VersionCompatibilityFactsService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/VersionCompatibilityFactsService.java
@@ -26,7 +26,7 @@
  * Creates fact statements about property's version compatibility by using semantic information specified
  * by @Since and @VersionCompatibility annotations. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class VersionCompatibilityFactsService extends FactsService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/VersionCompatibilityValidationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/VersionCompatibilityValidationService.java
index 3f1d183..0a02e1a 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/VersionCompatibilityValidationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/internal/VersionCompatibilityValidationService.java
@@ -25,7 +25,7 @@
  * An implementation of ValidationService that produces a validation error when a property 

  * is not compatible with the version compatibility target yet contains data. 

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class VersionCompatibilityValidationService extends ValidationService

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/BinaryData.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/BinaryData.java
index b0b7bdb..65fdda6 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/BinaryData.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/BinaryData.java
@@ -18,7 +18,7 @@
 import java.util.Arrays;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class BinaryData
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ByteArrayResourceStore.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ByteArrayResourceStore.java
index 25c895d..c139ac0 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ByteArrayResourceStore.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ByteArrayResourceStore.java
@@ -17,7 +17,7 @@
 import java.io.InputStream;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class ByteArrayResourceStore extends ResourceStore
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/CapitalizationType.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/CapitalizationType.java
index bfa3ca3..f97d118 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/CapitalizationType.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/CapitalizationType.java
@@ -15,7 +15,7 @@
 import java.util.Set;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public enum CapitalizationType
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/CorruptedResourceException.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/CorruptedResourceException.java
index 735d654..07a488d 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/CorruptedResourceException.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/CorruptedResourceException.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.modeling;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class CorruptedResourceException
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/CorruptedResourceExceptionInterceptor.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/CorruptedResourceExceptionInterceptor.java
index aa87151..3b859a3 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/CorruptedResourceExceptionInterceptor.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/CorruptedResourceExceptionInterceptor.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.modeling;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class CorruptedResourceExceptionInterceptor
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/DelimitedListBindingImpl.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/DelimitedListBindingImpl.java
index 1e682d6..6ab4aea 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/DelimitedListBindingImpl.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/DelimitedListBindingImpl.java
@@ -24,7 +24,7 @@
 import org.eclipse.sapphire.ValuePropertyBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class DelimitedListBindingImpl extends ListPropertyBinding
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/DoubleValueKeyword.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/DoubleValueKeyword.java
index 436c547..73b17a6 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/DoubleValueKeyword.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/DoubleValueKeyword.java
@@ -18,7 +18,7 @@
 
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class DoubleValueKeyword
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/EditFailedException.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/EditFailedException.java
index 26b53f6..275e8c9 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/EditFailedException.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/EditFailedException.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.modeling;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class EditFailedException
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ElementDisposeEvent.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ElementDisposeEvent.java
index ea8afdc..5285ba9 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ElementDisposeEvent.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ElementDisposeEvent.java
@@ -17,7 +17,7 @@
 import org.eclipse.sapphire.services.ServiceEvent;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ElementDisposeEvent extends ElementEvent
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ElementEvent.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ElementEvent.java
index c1f27ec..2235ca8 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ElementEvent.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ElementEvent.java
@@ -17,7 +17,7 @@
 import org.eclipse.sapphire.Event;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class ElementEvent extends Event
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ElementPropertyBinding.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ElementPropertyBinding.java
index e78c477..42417ae 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ElementPropertyBinding.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ElementPropertyBinding.java
@@ -16,7 +16,7 @@
 import org.eclipse.sapphire.Resource;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class ElementPropertyBinding extends PropertyBinding
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/EnumValueType.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/EnumValueType.java
index 79a8a37..5d5196b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/EnumValueType.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/EnumValueType.java
@@ -23,7 +23,7 @@
 import org.eclipse.sapphire.util.ListFactory;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class EnumValueType extends ModelMetadataItem
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ExtensionsLocator.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ExtensionsLocator.java
index 8753ccd..8e98675 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ExtensionsLocator.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ExtensionsLocator.java
@@ -23,7 +23,7 @@
 import org.eclipse.sapphire.Sapphire;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class ExtensionsLocator
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/FileResourceStore.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/FileResourceStore.java
index f15fc3a..1cc11ce 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/FileResourceStore.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/FileResourceStore.java
@@ -21,7 +21,7 @@
 import java.io.OutputStream;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class FileResourceStore extends ByteArrayResourceStore
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/FloatValueKeyword.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/FloatValueKeyword.java
index 21b970d..7ea54f9 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/FloatValueKeyword.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/FloatValueKeyword.java
@@ -17,7 +17,7 @@
 import org.eclipse.sapphire.Sapphire;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class FloatValueKeyword extends ValueKeyword
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/IntegerValueKeyword.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/IntegerValueKeyword.java
index cc0044c..8a3fc09 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/IntegerValueKeyword.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/IntegerValueKeyword.java
@@ -18,7 +18,7 @@
 
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class IntegerValueKeyword extends ValueKeyword
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/LayeredElementBindingImpl.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/LayeredElementBindingImpl.java
index f2b33e4..dd980cd 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/LayeredElementBindingImpl.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/LayeredElementBindingImpl.java
@@ -15,7 +15,7 @@
 import org.eclipse.sapphire.Resource;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class LayeredElementBindingImpl
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/LongValueKeyword.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/LongValueKeyword.java
index 235c6aa..7e2ef9d 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/LongValueKeyword.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/LongValueKeyword.java
@@ -17,7 +17,7 @@
 import org.eclipse.sapphire.Sapphire;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class LongValueKeyword extends ValueKeyword
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ModelMetadataItem.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ModelMetadataItem.java
index 1c64605..117127f 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ModelMetadataItem.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ModelMetadataItem.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.util.MapFactory;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class ModelMetadataItem 
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ModelPath.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ModelPath.java
index 4f3ef98..0451b09 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ModelPath.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ModelPath.java
@@ -18,7 +18,7 @@
 import java.util.Set;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ModelPath
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ModelRelativePath.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ModelRelativePath.java
index f338f92..8e8f846 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ModelRelativePath.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ModelRelativePath.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/Path.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/Path.java
index dfc3036..17337db 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/Path.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/Path.java
@@ -29,7 +29,7 @@
  * <pre>     /a/foo/bar</pre>
  * 
  * @author IBM
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class Path
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ProgressMonitor.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ProgressMonitor.java
index fd0fba9..7a97365 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ProgressMonitor.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ProgressMonitor.java
@@ -43,7 +43,7 @@
  * </p>
  * 
  * @author IBM
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 public class ProgressMonitor 
 {
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ResourceStore.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ResourceStore.java
index 1e814e6..3973ee1 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ResourceStore.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ResourceStore.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.modeling.localization.SourceLanguageLocalizationService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class ResourceStore implements Disposable
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ResourceStoreException.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ResourceStoreException.java
index e5aaab4..8103747 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ResourceStoreException.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ResourceStoreException.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.modeling;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class ResourceStoreException extends Exception
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/SharedModelsCache.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/SharedModelsCache.java
index 5fdbca5..06cfe0d 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/SharedModelsCache.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/SharedModelsCache.java
@@ -36,7 +36,7 @@
  * <p>The cache will never return a model whose resource reports that it is out of date. Models that are not
  * backed by a resource are never considered to be out of date.</p>
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class SharedModelsCache
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/Status.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/Status.java
index f81196e..e866548 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/Status.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/Status.java
@@ -24,7 +24,7 @@
 import org.eclipse.sapphire.util.SortedSetFactory;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class Status
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/UrlResourceStore.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/UrlResourceStore.java
index 2dae244..11d9fa0 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/UrlResourceStore.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/UrlResourceStore.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.modeling.localization.StandardLocalizationService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class UrlResourceStore extends ByteArrayResourceStore
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ValidateEditException.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ValidateEditException.java
index 8882856..e2e0551 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ValidateEditException.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ValidateEditException.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.modeling;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class ValidateEditException
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ValueKeyword.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ValueKeyword.java
index eab2242..00223fb 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ValueKeyword.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/ValueKeyword.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.modeling;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class ValueKeyword
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/AbsolutePath.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/AbsolutePath.java
index c2a952e..fee1a64 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/AbsolutePath.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/AbsolutePath.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/ClearOnDisable.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/ClearOnDisable.java
index 3dea97d..52d30eb 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/ClearOnDisable.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/ClearOnDisable.java
@@ -22,7 +22,7 @@
  * model and persistent storage, but can make it more difficult for users to return to the
  * prior state as data is erased. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/DefaultValue.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/DefaultValue.java
index 0615720..4f11ee5 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/DefaultValue.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/DefaultValue.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/DelegateImplementation.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/DelegateImplementation.java
index 0af5205..32eeff7 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/DelegateImplementation.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/DelegateImplementation.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/DependsOn.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/DependsOn.java
index 1d8c239..92dad55 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/DependsOn.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/DependsOn.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Derived.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Derived.java
index 5fbcf67..8b62da4 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Derived.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Derived.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Enablement.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Enablement.java
index 1881b34..4ac4303 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Enablement.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Enablement.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/EnumSerialization.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/EnumSerialization.java
index a5c39f9..7b80f98 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/EnumSerialization.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/EnumSerialization.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Fact.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Fact.java
index bb2e69d..c903a85 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Fact.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Fact.java
@@ -18,7 +18,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Facts.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Facts.java
index da3beb3..232c000 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Facts.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Facts.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/FileExtensions.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/FileExtensions.java
index 702716e..31a7a67 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/FileExtensions.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/FileExtensions.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/FileSystemResourceType.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/FileSystemResourceType.java
index 0df7d35..b0d42d0 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/FileSystemResourceType.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/FileSystemResourceType.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.modeling.annotations;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public enum FileSystemResourceType
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/FixedOrderList.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/FixedOrderList.java
index c6cf607..10de635 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/FixedOrderList.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/FixedOrderList.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Image.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Image.java
index 34a94be..d1a4e3d 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Image.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Image.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/InitialValue.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/InitialValue.java
index 5b4b3b2..3d3c445 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/InitialValue.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/InitialValue.java
@@ -19,7 +19,7 @@
 
 /**
  * @author <a href="mailto:kamesh.sampath@accenture.com">Kamesh Sampath</a>
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Label.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Label.java
index e073eae..93df91d 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Label.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Label.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Listeners.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Listeners.java
index 9062b5a..16e2188 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Listeners.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Listeners.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.Listener;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/LongString.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/LongString.java
index 49b4656..71122df 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/LongString.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/LongString.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/MustExist.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/MustExist.java
index 65ce962..bb0e94c 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/MustExist.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/MustExist.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/NamedValues.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/NamedValues.java
index 342e0e1..ee7e207 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/NamedValues.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/NamedValues.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/NumericRange.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/NumericRange.java
index 5a66561..5ef5287 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/NumericRange.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/NumericRange.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/ReadOnly.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/ReadOnly.java
index 060d4f8..bc901ec 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/ReadOnly.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/ReadOnly.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Reference.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Reference.java
index b8724e8..cc6f25f 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Reference.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Reference.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Required.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Required.java
index a848b1b..7603299 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Required.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Required.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/SensitiveData.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/SensitiveData.java
index 32b4500..6cabf34 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/SensitiveData.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/SensitiveData.java
@@ -20,7 +20,7 @@
  * Used to tag properties whose values need to be treated in a more secure manner. A typical
  * example of this is a password.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Service.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Service.java
index 5825703..a2a58dc 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Service.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Service.java
@@ -20,7 +20,7 @@
 /**
  * Attaches a custom service implementation to an element or a property.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Services.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Services.java
index a001862..c5ed3e3 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Services.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Services.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/ValidFileSystemResourceType.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/ValidFileSystemResourceType.java
index af36976..8507751 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/ValidFileSystemResourceType.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/ValidFileSystemResourceType.java
@@ -17,7 +17,7 @@
 import java.lang.annotation.Target;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Whitespace.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Whitespace.java
index fed9ab0..c8d7cd9 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Whitespace.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/annotations/Whitespace.java
@@ -19,7 +19,7 @@
 /**
  * Specifies how whitespace should be handled during value normalization.
  *  
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/DocumentationContent.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/DocumentationContent.java
index ec01b40..a4d0bc1 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/DocumentationContent.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/DocumentationContent.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.modeling.el.parser.internal.TokenMgrError;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class DocumentationContent
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/DocumentationPart.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/DocumentationPart.java
index dcd2b87..3f39f8f 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/DocumentationPart.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/DocumentationPart.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.modeling.docsys;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class DocumentationPart
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/HtmlFormatter.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/HtmlFormatter.java
index edc7f67..e03c8e0 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/HtmlFormatter.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/HtmlFormatter.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.modeling.docsys;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class HtmlFormatter
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/LineBreakPart.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/LineBreakPart.java
index e89cc67..e049aad 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/LineBreakPart.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/LineBreakPart.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.modeling.docsys;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class LineBreakPart
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/ListItem.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/ListItem.java
index 9955b53..efeec3b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/ListItem.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/ListItem.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.modeling.docsys;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ListItem
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/ListPart.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/ListPart.java
index ab4f5e9..4cede63 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/ListPart.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/ListPart.java
@@ -15,7 +15,7 @@
 import java.util.List;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class ListPart
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/OrderedListPart.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/OrderedListPart.java
index 6623289..5fa4aaa 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/OrderedListPart.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/OrderedListPart.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.modeling.docsys;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class OrderedListPart
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/ParagraphBreakPart.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/ParagraphBreakPart.java
index 952682c..c2e5f62 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/ParagraphBreakPart.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/ParagraphBreakPart.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.modeling.docsys;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ParagraphBreakPart
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/TextPart.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/TextPart.java
index 96261cc..4ac2741 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/TextPart.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/TextPart.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.modeling.docsys;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class TextPart
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/UnorderedListPart.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/UnorderedListPart.java
index 0a04c43..2e4f413 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/UnorderedListPart.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/docsys/UnorderedListPart.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.modeling.docsys;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class UnorderedListPart
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/AddFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/AddFunction.java
index eead4d0..63543e1 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/AddFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/AddFunction.java
@@ -21,7 +21,7 @@
 /**
  * Arithmetic addition function. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class AddFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/AggregateFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/AggregateFunction.java
index 760aec1..898d133 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/AggregateFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/AggregateFunction.java
@@ -28,7 +28,7 @@
 import org.eclipse.sapphire.ValueProperty;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class AggregateFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/AndFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/AndFunction.java
index 9275280..078ceaf 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/AndFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/AndFunction.java
@@ -18,7 +18,7 @@
 /**
  * Logical AND function. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class AndFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ArithmeticNegationFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ArithmeticNegationFunction.java
index b33f574..3e70c28 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ArithmeticNegationFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ArithmeticNegationFunction.java
@@ -23,7 +23,7 @@
 /**
  * Arithmetic unary minus function. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ArithmeticNegationFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/AvgFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/AvgFunction.java
index eb7807a..e521a81 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/AvgFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/AvgFunction.java
@@ -21,7 +21,7 @@
  * If the the collection is a model element list and the second parameter is not specified, this function
  * will use list entry's first value property for aggregation. An average of an empty collection is 0.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class AvgFunction extends AggregateFunction
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ConcatFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ConcatFunction.java
index 570935a..8a4124b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ConcatFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ConcatFunction.java
@@ -18,7 +18,7 @@
  * contexts where composite expressions cannot be used, such as where the result of 
  * concatenation needs to feed into another function or operator. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ConcatFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ConditionalFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ConditionalFunction.java
index 4b70e7a..559a632 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ConditionalFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ConditionalFunction.java
@@ -21,7 +21,7 @@
 /**
  * Function that returns one of two alternatives depending on a condition. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ConditionalFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/DeferredFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/DeferredFunction.java
index cc2ad5e..d268c96 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/DeferredFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/DeferredFunction.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.util.ListFactory;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class DeferredFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/DivideFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/DivideFunction.java
index cf0b5b8..193d2c6 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/DivideFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/DivideFunction.java
@@ -19,7 +19,7 @@
 /**
  * Arithmetic division function. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class DivideFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/EmptyFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/EmptyFunction.java
index 9de211a..4735d62 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/EmptyFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/EmptyFunction.java
@@ -19,7 +19,7 @@
 /**
  * Function for determining if a value is null or empty. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class EmptyFunction
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/EqualityFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/EqualityFunction.java
index e5da968..5902c4d 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/EqualityFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/EqualityFunction.java
@@ -17,7 +17,7 @@
 /**
  * Equality function. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class EqualityFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/FailSafeFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/FailSafeFunction.java
index 3029b33..84a253c 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/FailSafeFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/FailSafeFunction.java
@@ -17,7 +17,7 @@
  * Function that ensures that the returned value is of specified type and prevents function
  * exceptions from propagating.  
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class FailSafeFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/FirstSegmentFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/FirstSegmentFunction.java
index ca3646c..73ed7c8 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/FirstSegmentFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/FirstSegmentFunction.java
@@ -20,7 +20,7 @@
  * second is a sequence of characters that individually should be treated as
  * valid separators.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class FirstSegmentFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/Function.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/Function.java
index ff0b1cc..810dec1 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/Function.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/Function.java
@@ -18,7 +18,7 @@
 import org.eclipse.sapphire.util.ListFactory;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/FunctionContext.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/FunctionContext.java
index f315362..46d122e 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/FunctionContext.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/FunctionContext.java
@@ -27,7 +27,7 @@
 import org.eclipse.sapphire.modeling.localization.SourceLanguageLocalizationService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class FunctionContext
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/FunctionException.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/FunctionException.java
index bab3282..401613a 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/FunctionException.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/FunctionException.java
@@ -18,7 +18,7 @@
 /**
  * Thrown if a function evaluation fails for any reason.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class FunctionException extends RuntimeException
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/FunctionResult.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/FunctionResult.java
index 4f4d62b..dbdcc3c 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/FunctionResult.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/FunctionResult.java
@@ -36,7 +36,7 @@
 import org.eclipse.sapphire.modeling.Status;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class FunctionResult implements Disposable, AutoCloseable
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/GlobalFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/GlobalFunction.java
index dca163b..530aad7 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/GlobalFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/GlobalFunction.java
@@ -16,7 +16,7 @@
 /**
  * Returns a map of global objects maintained through {@link Sapphire#global()} API.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class GlobalFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/GreaterThanFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/GreaterThanFunction.java
index f6e2b15..3bb3045 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/GreaterThanFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/GreaterThanFunction.java
@@ -21,7 +21,7 @@
 /**
  * Greater than comparison function. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class GreaterThanFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/GreaterThanOrEqualFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/GreaterThanOrEqualFunction.java
index eac7921..b45fbfc 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/GreaterThanOrEqualFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/GreaterThanOrEqualFunction.java
@@ -21,7 +21,7 @@
 /**
  * Greater than or equal comparison function. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class GreaterThanOrEqualFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ImageFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ImageFunction.java
index e3ced9c..b9c7deb 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ImageFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ImageFunction.java
@@ -21,7 +21,7 @@
 /**
  * A function that returns the image associated with the current model element. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ImageFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/InFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/InFunction.java
index 5a592fa..e19a9bf 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/InFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/InFunction.java
@@ -16,7 +16,7 @@
 /**
  * In function. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class InFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/InstanceOfFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/InstanceOfFunction.java
index e77baa1..1cd7629 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/InstanceOfFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/InstanceOfFunction.java
@@ -20,7 +20,7 @@
  * Determines if an object is of specified type. The object to be checked is the first operand and the
  * type is the second operand. The type must be a fully-qualified Java class name.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class InstanceOfFunction
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/LastSegmentFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/LastSegmentFunction.java
index b9a1c80..09c5ae2 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/LastSegmentFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/LastSegmentFunction.java
@@ -20,7 +20,7 @@
  * second is a sequence of characters that individually should be treated as
  * valid separators.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class LastSegmentFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/LessThanFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/LessThanFunction.java
index 4e26598..823f48f 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/LessThanFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/LessThanFunction.java
@@ -21,7 +21,7 @@
 /**
  * Less than comparison function. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class LessThanFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/LessThanOrEqualFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/LessThanOrEqualFunction.java
index f53ba20..dd6eec8 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/LessThanOrEqualFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/LessThanOrEqualFunction.java
@@ -21,7 +21,7 @@
 /**
  * Less than or equal comparison function. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class LessThanOrEqualFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ListFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ListFunction.java
index 1dfa2d4..b3d54f2 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ListFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ListFunction.java
@@ -18,7 +18,7 @@
 /**
  * Function that constructs a list from arbitrary number of operands. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ListFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/Literal.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/Literal.java
index 3d78fe5..9272860 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/Literal.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/Literal.java
@@ -16,7 +16,7 @@
 /**
  * A function that always evaluates to the same value. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class Literal extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/LowerCaseFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/LowerCaseFunction.java
index b1e1ede..7c711aa 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/LowerCaseFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/LowerCaseFunction.java
@@ -15,7 +15,7 @@
  * Converts a string to lower case. Can be used either as <nobr>LowerCase( Name )</nobr>
  * or as <nobr>Name.LowerCase()</nobr>.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class LowerCaseFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/MaxFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/MaxFunction.java
index a4bfd8c..27fb0ba 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/MaxFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/MaxFunction.java
@@ -21,7 +21,7 @@
  * If the the collection is a model element list and the second parameter is not specified, this function
  * will use list entry's first value property for aggregation. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class MaxFunction extends AggregateFunction
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/MinFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/MinFunction.java
index 198f023..f919f3a 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/MinFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/MinFunction.java
@@ -21,7 +21,7 @@
  * If the the collection is a model element list and the second parameter is not specified, this function
  * will use list entry's first value property for aggregation. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class MinFunction extends AggregateFunction
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ModelElementFunctionContext.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ModelElementFunctionContext.java
index 0a591cb..f275c63 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ModelElementFunctionContext.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ModelElementFunctionContext.java
@@ -29,7 +29,7 @@
 import org.eclipse.sapphire.modeling.localization.SourceLanguageLocalizationService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class ModelElementFunctionContext extends FunctionContext
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ModuloFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ModuloFunction.java
index fea6776..8eadd2b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ModuloFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ModuloFunction.java
@@ -21,7 +21,7 @@
 /**
  * Arithmetic modulo function. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ModuloFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/MultiplyFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/MultiplyFunction.java
index b777f11..6d61bf6 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/MultiplyFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/MultiplyFunction.java
@@ -21,7 +21,7 @@
 /**
  * Arithmetic multiplication function. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class MultiplyFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/NotFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/NotFunction.java
index 6b59f43..df9870d 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/NotFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/NotFunction.java
@@ -14,7 +14,7 @@
 /**
  * Logical NOT function. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class NotFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/OrFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/OrFunction.java
index c569751..5d17dd3 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/OrFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/OrFunction.java
@@ -18,7 +18,7 @@
 /**
  * Logical OR function. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class OrFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ParentElementFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ParentElementFunction.java
index f48efb7..913a121 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ParentElementFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ParentElementFunction.java
@@ -19,7 +19,7 @@
 /**
  * A function that returns the parent of the current model element. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ParentElementFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/PropertyAccessFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/PropertyAccessFunction.java
index 062ec58..ad4737a 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/PropertyAccessFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/PropertyAccessFunction.java
@@ -18,7 +18,7 @@
 /**
  * A function that reads a property from the context or a child element. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class PropertyAccessFunction
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/RootElementFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/RootElementFunction.java
index 7c2a0c6..1b2a379 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/RootElementFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/RootElementFunction.java
@@ -18,7 +18,7 @@
 /**
  * A function that returns the root of the model. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class RootElementFunction
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/SapphireVersionMatchesFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/SapphireVersionMatchesFunction.java
index 9b07cde..98e89ee 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/SapphireVersionMatchesFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/SapphireVersionMatchesFunction.java
@@ -22,7 +22,7 @@
  * the specified version. The parenthesis indicate that the range goes up to, but does not actually
  * include the specified version. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class SapphireVersionMatchesFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ScaleFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ScaleFunction.java
index ef7b8e0..9c25b01 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ScaleFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/ScaleFunction.java
@@ -16,7 +16,7 @@
 /**
  * Changes the scale of a decimal. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ScaleFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/SubtractFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/SubtractFunction.java
index 1e78f16..43b857e 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/SubtractFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/SubtractFunction.java
@@ -21,7 +21,7 @@
 /**
  * Arithmetic subtraction function. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class SubtractFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/SumFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/SumFunction.java
index 7af4ec2..1f85b5b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/SumFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/SumFunction.java
@@ -21,7 +21,7 @@
  * If the the collection is a model element list and the second parameter is not specified, this function
  * will use list entry's first value property for aggregation. A sum of an empty collection is 0.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class SumFunction extends AggregateFunction
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/UpperCaseFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/UpperCaseFunction.java
index b1aef10..4007367 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/UpperCaseFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/UpperCaseFunction.java
@@ -15,7 +15,7 @@
  * Converts a string to upper case. Can be used either as <nobr>UpperCase( Name )</nobr>
  * or as <nobr>Name.UpperCase()</nobr>.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class UpperCaseFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/VersionMatchesFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/VersionMatchesFunction.java
index 69590f9..e8e996a 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/VersionMatchesFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/VersionMatchesFunction.java
@@ -21,7 +21,7 @@
  * the specified version. The parenthesis indicate that the range goes up to, but does not actually
  * include the specified version. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class VersionMatchesFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/AbsolutePathFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/AbsolutePathFunction.java
index 2be3d30..61a622d 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/AbsolutePathFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/AbsolutePathFunction.java
@@ -20,7 +20,7 @@
 /**

  * Returns the absolute path of a value for properties with a RelativePathService.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class AbsolutePathFunction extends PropertyFunction<Value<?>>

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/ContentFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/ContentFunction.java
index 3fc2727..992ce38 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/ContentFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/ContentFunction.java
@@ -23,7 +23,7 @@
 /**

  * Returns the content of a value or a transient. For value properties, the default is taken into account, if applicable.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class ContentFunction extends PropertyFunction<Property>

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/EnabledFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/EnabledFunction.java
index dbce567..3cc8ab7 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/EnabledFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/EnabledFunction.java
@@ -18,7 +18,7 @@
 /**

  * Returns the enablement of a property.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class EnabledFunction extends PropertyFunction<Property>

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/EncodeToXmlFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/EncodeToXmlFunction.java
index 7e821db..b07fac6 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/EncodeToXmlFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/EncodeToXmlFunction.java
@@ -18,7 +18,7 @@
 /**
  * Encodes text for use as XML element content or an attribute value. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class EncodeToXmlFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/EndsWithFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/EndsWithFunction.java
index 2cd8895..2715747 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/EndsWithFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/EndsWithFunction.java
@@ -18,7 +18,7 @@
 /**
  * Tests if a string ends with the specified suffix.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class EndsWithFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/FragmentFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/FragmentFunction.java
index f3fa733..4227a83 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/FragmentFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/FragmentFunction.java
@@ -27,7 +27,7 @@
  *   <li>An end index that is smaller than the start index is normalized to the start index.</li>
  * </ul>
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class FragmentFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/FunctionUtils.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/FunctionUtils.java
index 31ddbb0..580ad10 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/FunctionUtils.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/FunctionUtils.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.modeling.el.internal;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class FunctionUtils
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/HeadFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/HeadFunction.java
index 11f1d6d..b6d1341 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/HeadFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/HeadFunction.java
@@ -23,7 +23,7 @@
  *   <li>A fragment length exceeding the length of the input is normalized to the length of the input.</li>
  * </ul>
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class HeadFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/IndexFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/IndexFunction.java
index 29c9df1..0eca26c 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/IndexFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/IndexFunction.java
@@ -27,7 +27,7 @@
 /**
  * Determines the index of a model element within its parent list. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class IndexFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/MatchesFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/MatchesFunction.java
index d22d0ff..35be9c8 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/MatchesFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/MatchesFunction.java
@@ -19,7 +19,7 @@
  * Determines whether a string matches a regular expression. The full semantics are specified by Java's
  * String.matches() function.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class MatchesFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/MessageFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/MessageFunction.java
index 8737720..c46b74c 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/MessageFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/MessageFunction.java
@@ -19,7 +19,7 @@
 /**

  * Returns the message from a validation result.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class MessageFunction extends Function

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/PropertyFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/PropertyFunction.java
index e26b31c..e202ded 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/PropertyFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/PropertyFunction.java
@@ -23,7 +23,7 @@
 import org.eclipse.sapphire.modeling.el.FunctionResult;

 

 /**

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public abstract class PropertyFunction<P extends Property> extends Function

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/ReplaceFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/ReplaceFunction.java
index 02fac8d..95efcb5 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/ReplaceFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/ReplaceFunction.java
@@ -19,7 +19,7 @@
  * Replaces all occurrences of a regular expression pattern with the provided replacement text. The full semantics
  * are specified by Java's {@link String#replaceAll( String, String )} function.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ReplaceFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/SeverityFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/SeverityFunction.java
index fe1c0b7..5b4c399 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/SeverityFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/SeverityFunction.java
@@ -19,7 +19,7 @@
 /**

  * Returns the severity of a validation result.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class SeverityFunction extends Function

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/SizeFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/SizeFunction.java
index 33cddaa..74f6cdb 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/SizeFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/SizeFunction.java
@@ -31,7 +31,7 @@
 /**

  * Determines the size of a collection, a map, an array or a string.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class SizeFunction extends Function

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/StartsWithFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/StartsWithFunction.java
index 9bdda33..e0a658e 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/StartsWithFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/StartsWithFunction.java
@@ -18,7 +18,7 @@
 /**
  * Tests if a string starts with the specified prefix.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StartsWithFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/TailFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/TailFunction.java
index 10f0702..3a4e70b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/TailFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/TailFunction.java
@@ -23,7 +23,7 @@
  *   <li>A fragment length exceeding the length of the input is normalized to the length of the input.</li>
  * </ul>
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class TailFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/TextFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/TextFunction.java
index 0f81332..43c44f3 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/TextFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/TextFunction.java
@@ -18,7 +18,7 @@
 /**

  * Returns the text of a value, taking into account the default, if applicable.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class TextFunction extends PropertyFunction<Value<?>>

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/ValidationFunction.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/ValidationFunction.java
index 59e8779..3ce85b4 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/ValidationFunction.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/internal/ValidationFunction.java
@@ -18,7 +18,7 @@
 /**

  * Returns the validation result of a property.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class ValidationFunction extends PropertyFunction<Property>

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/parser/ExpressionLanguageParser.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/parser/ExpressionLanguageParser.java
index c338abb..97e07a1 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/parser/ExpressionLanguageParser.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/parser/ExpressionLanguageParser.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.modeling.el.parser.internal.TokenMgrError;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ExpressionLanguageParser
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/parser/internal/StringLiteral.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/parser/internal/StringLiteral.java
index 6970b4a..e25abf1 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/parser/internal/StringLiteral.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/el/parser/internal/StringLiteral.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.modeling.el.parser.internal;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StringLiteral
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/internal/MemoryResource.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/internal/MemoryResource.java
index a9be099..270041a 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/internal/MemoryResource.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/internal/MemoryResource.java
@@ -27,7 +27,7 @@
 import org.eclipse.sapphire.modeling.ElementPropertyBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class MemoryResource extends Resource
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/internal/SapphireModelingExtensionSystem.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/internal/SapphireModelingExtensionSystem.java
index 27e3b5d..e018277 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/internal/SapphireModelingExtensionSystem.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/internal/SapphireModelingExtensionSystem.java
@@ -43,7 +43,7 @@
 import org.xml.sax.InputSource;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class SapphireModelingExtensionSystem
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/ClassLocalizationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/ClassLocalizationService.java
index 5024b40..cd06d11 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/ClassLocalizationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/ClassLocalizationService.java
@@ -17,7 +17,7 @@
 import java.util.Map;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ClassLocalizationService extends StandardLocalizationService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/LabelTransformer.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/LabelTransformer.java
index 66f9f99..6526099 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/LabelTransformer.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/LabelTransformer.java
@@ -14,7 +14,7 @@
 import org.eclipse.sapphire.modeling.CapitalizationType;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class LabelTransformer
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/LocalizationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/LocalizationService.java
index fc2fc7c..20f22a7 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/LocalizationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/LocalizationService.java
@@ -17,7 +17,7 @@
 import org.eclipse.sapphire.modeling.annotations.Label;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class LocalizationService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/LocalizationSystem.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/LocalizationSystem.java
index ee1bfde..42188f3 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/LocalizationSystem.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/LocalizationSystem.java
@@ -14,7 +14,7 @@
 import java.util.Locale;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class LocalizationSystem
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/LocalizationUtil.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/LocalizationUtil.java
index a909cc3..ff7dd5c 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/LocalizationUtil.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/LocalizationUtil.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.modeling.localization;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class LocalizationUtil
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/SourceLanguageLocalizationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/SourceLanguageLocalizationService.java
index a3bdb92..04d44c7 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/SourceLanguageLocalizationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/SourceLanguageLocalizationService.java
@@ -14,7 +14,7 @@
 import org.eclipse.sapphire.modeling.CapitalizationType;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class SourceLanguageLocalizationService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/StandardLocalizationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/StandardLocalizationService.java
index 56627fe..c1f5a9b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/StandardLocalizationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/localization/StandardLocalizationService.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.modeling.CapitalizationType;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class StandardLocalizationService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/util/DependencySorter.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/util/DependencySorter.java
index d2cc2be..b930a9b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/util/DependencySorter.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/util/DependencySorter.java
@@ -25,7 +25,7 @@
 /**
  * Sorts objects in dependencies-first order.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class DependencySorter<K,T>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/util/MiscUtil.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/util/MiscUtil.java
index b2fe0b3..835310a 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/util/MiscUtil.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/modeling/util/MiscUtil.java
@@ -28,7 +28,7 @@
 import org.eclipse.sapphire.Sapphire;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class MiscUtil
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ContentProposal.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ContentProposal.java
index 6c7c24f..564c64b 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ContentProposal.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ContentProposal.java
@@ -15,7 +15,7 @@
 import org.eclipse.sapphire.ImageData;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:kamesh.sampath@accenture.com">Kamesh Sampath</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ContentProposalService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ContentProposalService.java
index 67723f7..ea14086 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ContentProposalService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ContentProposalService.java
@@ -16,7 +16,7 @@
 import java.util.List;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:kamesh.sampath@accenture.com">Kamesh Sampath</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/DataService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/DataService.java
index 626691b..86b1428 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/DataService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/DataService.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.Text;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class DataService<T> extends Service
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/DependenciesService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/DependenciesService.java
index c1f1b84..73e1888 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/DependenciesService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/DependenciesService.java
@@ -19,7 +19,7 @@
  * Produces the set of model paths that point to parts of the model that the property depends on. Most frequently
  * specified via @DependsOn annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class DependenciesService extends DataService<DependenciesServiceData>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/DependenciesServiceData.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/DependenciesServiceData.java
index 9fcc1df..6c619a6 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/DependenciesServiceData.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/DependenciesServiceData.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.modeling.ModelPath;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class DependenciesServiceData
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/DocumentationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/DocumentationService.java
index 68f37dd..5eebbe5 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/DocumentationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/DocumentationService.java
@@ -15,7 +15,7 @@
 import java.util.List;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class DocumentationService extends Service
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/EqualityService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/EqualityService.java
index b1b59de..b56c9d0 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/EqualityService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/EqualityService.java
@@ -15,7 +15,7 @@
  * Provides means to implement equals() and hashCode() methods when the context object doesn't support
  * implementing these methods directly.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class EqualityService extends Service
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/FactsAggregationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/FactsAggregationService.java
index e9586f1..ef6e757 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/FactsAggregationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/FactsAggregationService.java
@@ -23,7 +23,7 @@
  * <p>An implementation of this service is provided with Sapphire. This service is not intended to
  * be implemented by adopters.</p>
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class FactsAggregationService extends Service
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/FactsService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/FactsService.java
index 8cfb070..bb150ed 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/FactsService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/FactsService.java
@@ -21,7 +21,7 @@
  * most commonly used as a way to translate machine friendly model annotations into user friendly verbal
  * statements. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class FactsService extends Service
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/FileExtensionsService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/FileExtensionsService.java
index 87a4262..5e7e50d 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/FileExtensionsService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/FileExtensionsService.java
@@ -17,7 +17,7 @@
  * Produces the list of file extensions that are allowed for a path value property. Most frequently specified
  * via @FileExtensions annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class FileExtensionsService extends DataService<FileExtensionsServiceData>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/FileExtensionsServiceData.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/FileExtensionsServiceData.java
index 750e948..985b8d7 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/FileExtensionsServiceData.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/FileExtensionsServiceData.java
@@ -19,7 +19,7 @@
 import java.util.List;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class FileExtensionsServiceData
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/PathValidationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/PathValidationService.java
index 4d06bf4..4080aa2 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/PathValidationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/PathValidationService.java
@@ -25,7 +25,7 @@
 import org.eclipse.sapphire.modeling.annotations.ValidFileSystemResourceType;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class PathValidationService extends ValidationService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ReferenceService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ReferenceService.java
index 17cb0ac..5761046 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ReferenceService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ReferenceService.java
@@ -16,7 +16,7 @@
 import org.eclipse.sapphire.PropertyContentEvent;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class ReferenceService<T> extends DataService<T>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/RelativePathService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/RelativePathService.java
index 62c639c..753624d 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/RelativePathService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/RelativePathService.java
@@ -22,7 +22,7 @@
  * Service for value properties of type Path that enables relative path support. Typically attached to
  * the property using the @Service annotation. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class RelativePathService extends Service
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/Service.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/Service.java
index afc0313..5fdbea9 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/Service.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/Service.java
@@ -25,7 +25,7 @@
 import org.eclipse.sapphire.util.SetFactory;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class Service implements Disposable
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ServiceCondition.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ServiceCondition.java
index 942e717..e84e7e0 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ServiceCondition.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ServiceCondition.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.services;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class ServiceCondition
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ServiceContext.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ServiceContext.java
index 7e3583b..497b6a4 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ServiceContext.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ServiceContext.java
@@ -26,7 +26,7 @@
 import org.eclipse.sapphire.util.ListFactory;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class ServiceContext implements Disposable
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ServiceEvent.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ServiceEvent.java
index 0a63b0d..fef71ed 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ServiceEvent.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ServiceEvent.java
@@ -16,7 +16,7 @@
 import org.eclipse.sapphire.Event;

 

 /**

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public class ServiceEvent extends Event

diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ServiceProxy.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ServiceProxy.java
index ba868e4..fb1aa85 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ServiceProxy.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ServiceProxy.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.util.SetFactory;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ServiceProxy implements Disposable
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/StandardValueNormalizationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/StandardValueNormalizationService.java
index fa04c6e..a064f51 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/StandardValueNormalizationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/StandardValueNormalizationService.java
@@ -19,7 +19,7 @@
  * declarative annotations, such as @Whitespace. Can be extended to add further normalization
  * logic to what's provided by the system.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class StandardValueNormalizationService extends ValueNormalizationService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ValidationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ValidationService.java
index fead541..26f74cf 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ValidationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ValidationService.java
@@ -17,7 +17,7 @@
 import org.eclipse.sapphire.modeling.Status;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class ValidationService extends DataService<Status>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ValueImageService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ValueImageService.java
index caa69b3..df22719 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ValueImageService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ValueImageService.java
@@ -16,7 +16,7 @@
 /**
  * Provides the image to use when presenting a given value to the user.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class ValueImageService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ValueLabelService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ValueLabelService.java
index 7d98cd5..6edbefc 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ValueLabelService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ValueLabelService.java
@@ -15,7 +15,7 @@
  * Provides the label to be used when presenting a given value to the user. The default behavior is
  * to use the value itself.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class ValueLabelService extends Service
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ValueNormalizationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ValueNormalizationService.java
index 4fe090f..9946387 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ValueNormalizationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/ValueNormalizationService.java
@@ -15,7 +15,7 @@
  * Handles normalization of value during property read and write. Can be implemented directly
  * or used via declarative rules, such as the @Whitespace annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class ValueNormalizationService extends Service
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/AbsolutePathFactsService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/AbsolutePathFactsService.java
index 3aba14d..003f601 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/AbsolutePathFactsService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/AbsolutePathFactsService.java
@@ -25,7 +25,7 @@
  * Creates fact statements about property's absolute path requirement by using semantical information 
  * specified by @AbsolutePath annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class AbsolutePathFactsService extends FactsService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/AbsolutePathValidationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/AbsolutePathValidationService.java
index 3f032e2..04b606a 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/AbsolutePathValidationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/AbsolutePathValidationService.java
@@ -24,7 +24,7 @@
 import org.eclipse.sapphire.services.ServiceContext;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class AbsolutePathValidationService extends PathValidationService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/AnnotationsAwareServiceContext.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/AnnotationsAwareServiceContext.java
index 0660d12..8cabf93 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/AnnotationsAwareServiceContext.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/AnnotationsAwareServiceContext.java
@@ -26,7 +26,7 @@
 import org.eclipse.sapphire.util.SetFactory;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:rcernich@redhat.com">Rob Cernich</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/DeclarativeDependenciesService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/DeclarativeDependenciesService.java
index 3b5312c..fba73e3 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/DeclarativeDependenciesService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/DeclarativeDependenciesService.java
@@ -27,7 +27,7 @@
 /**
  * Implementation of DependenciesService that exposes dependencies specified by the @DependsOn annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class DeclarativeDependenciesService extends DependenciesService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/DeclarativeFileExtensionsService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/DeclarativeFileExtensionsService.java
index ed1343b..b9e870f 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/DeclarativeFileExtensionsService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/DeclarativeFileExtensionsService.java
@@ -37,7 +37,7 @@
 /**
  * Implementation of FileExtensionsService that derives its behavior from @FileExtensions annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class DeclarativeFileExtensionsService extends FileExtensionsService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/DefaultValueFactsService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/DefaultValueFactsService.java
index 361c5ea..6c704ba 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/DefaultValueFactsService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/DefaultValueFactsService.java
@@ -27,7 +27,7 @@
  * Creates fact statements about property's default value by using semantical information specified 
  * by DefaultValueService and @DefaultValue annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class DefaultValueFactsService extends FactsService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/DefaultValueImageService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/DefaultValueImageService.java
index 1e045af..7a854db 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/DefaultValueImageService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/DefaultValueImageService.java
@@ -18,7 +18,7 @@
 import org.eclipse.sapphire.services.ValueImageService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class DefaultValueImageService extends ValueImageService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/DeprecatedPropertyFactsService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/DeprecatedPropertyFactsService.java
index 51bc299..aacc673 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/DeprecatedPropertyFactsService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/DeprecatedPropertyFactsService.java
@@ -24,7 +24,7 @@
  * Creates fact statements about property's deprecated state by using semantical information specified 
  * by @Deprecated annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class DeprecatedPropertyFactsService extends FactsService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ElementInstanceServiceContext.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ElementInstanceServiceContext.java
index 02184dc..22d7707 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ElementInstanceServiceContext.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ElementInstanceServiceContext.java
@@ -15,7 +15,7 @@
 import org.eclipse.sapphire.ElementImpl;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ElementInstanceServiceContext extends ElementServiceContext
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ElementMetaModelServiceContext.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ElementMetaModelServiceContext.java
index 739f32f..07da259 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ElementMetaModelServiceContext.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ElementMetaModelServiceContext.java
@@ -15,7 +15,7 @@
 import org.eclipse.sapphire.Sapphire;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ElementMetaModelServiceContext extends ElementServiceContext
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ElementServiceContext.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ElementServiceContext.java
index c57477b..510c3e1 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ElementServiceContext.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ElementServiceContext.java
@@ -20,7 +20,7 @@
 import org.eclipse.sapphire.services.ServiceContext;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class ElementServiceContext extends AnnotationsAwareServiceContext
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/EnumValueImageService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/EnumValueImageService.java
index c154946..09acb83 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/EnumValueImageService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/EnumValueImageService.java
@@ -26,7 +26,7 @@
 import org.eclipse.sapphire.services.ValueImageService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class EnumValueImageService extends ValueImageService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/FileExtensionsFactsService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/FileExtensionsFactsService.java
index 1289a52..4226225 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/FileExtensionsFactsService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/FileExtensionsFactsService.java
@@ -26,7 +26,7 @@
  * Creates fact statements about valid file extensions for property's value by using semantical 
  * information specified by @FileExtensions annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class FileExtensionsFactsService extends FactsService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/InitialValueFactsService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/InitialValueFactsService.java
index 5c54a62..96e94ac 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/InitialValueFactsService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/InitialValueFactsService.java
@@ -27,7 +27,7 @@
  * Creates fact statements about property's initial value by using semantical information specified 
  * by InitialValueService and @InitialValue annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class InitialValueFactsService extends FactsService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/MalformedValueValidationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/MalformedValueValidationService.java
index f346dc6..6e56434 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/MalformedValueValidationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/MalformedValueValidationService.java
@@ -24,7 +24,7 @@
 import org.eclipse.sapphire.services.ValidationService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class MalformedValueValidationService extends ValidationService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ModelRelativePathService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ModelRelativePathService.java
index 70333dd..18ea8ea 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ModelRelativePathService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ModelRelativePathService.java
@@ -24,7 +24,7 @@
 import org.eclipse.sapphire.services.ServiceContext;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ModelRelativePathService extends RelativePathService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/MustExistFactsService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/MustExistFactsService.java
index 99bce0c..9b94ce8 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/MustExistFactsService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/MustExistFactsService.java
@@ -25,7 +25,7 @@
  * Creates fact statements about existence requirement on the entity referenced by property's value 
  * by using semantical information specified by @MustExist annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class MustExistFactsService extends FactsService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/NumericRangeFactsService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/NumericRangeFactsService.java
index d674af2..debe0b3 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/NumericRangeFactsService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/NumericRangeFactsService.java
@@ -26,7 +26,7 @@
  * Creates fact statements about numeric value property's range by using semantical information 
  * specified by @NumericRange annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class NumericRangeFactsService extends FactsService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/NumericRangeValidationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/NumericRangeValidationService.java
index 55ae135..33a775a 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/NumericRangeValidationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/NumericRangeValidationService.java
@@ -25,7 +25,7 @@
 import org.eclipse.sapphire.services.ValidationService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @SuppressWarnings( { "rawtypes", "unchecked" } )
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/PossibleValuesContentProposalService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/PossibleValuesContentProposalService.java
index 8c4edb8..7e698f7 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/PossibleValuesContentProposalService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/PossibleValuesContentProposalService.java
@@ -23,7 +23,7 @@
 import org.eclipse.sapphire.services.ServiceContext;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:kamesh.sampath@accenture.com">Kamesh Sampath</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/PossibleValuesValidationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/PossibleValuesValidationService.java
index 5359a60..bbc066e 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/PossibleValuesValidationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/PossibleValuesValidationService.java
@@ -23,7 +23,7 @@
 import org.eclipse.sapphire.services.ValidationService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class PossibleValuesValidationService extends ValidationService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/PropertyInstanceServiceContext.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/PropertyInstanceServiceContext.java
index d63686e..1cd3718 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/PropertyInstanceServiceContext.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/PropertyInstanceServiceContext.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.Property;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class PropertyInstanceServiceContext extends PropertyServiceContext
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/PropertyMetaModelServiceContext.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/PropertyMetaModelServiceContext.java
index d6bb33b..138edc0 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/PropertyMetaModelServiceContext.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/PropertyMetaModelServiceContext.java
@@ -15,7 +15,7 @@
 import org.eclipse.sapphire.Sapphire;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class PropertyMetaModelServiceContext extends PropertyServiceContext
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/PropertyServiceContext.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/PropertyServiceContext.java
index 4bbb2d0..b422091 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/PropertyServiceContext.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/PropertyServiceContext.java
@@ -25,7 +25,7 @@
 import org.eclipse.sapphire.services.ServiceContext;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class PropertyServiceContext extends AnnotationsAwareServiceContext
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ReadOnlyPropertyFactsService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ReadOnlyPropertyFactsService.java
index 178b7e6..6cd786e 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ReadOnlyPropertyFactsService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ReadOnlyPropertyFactsService.java
@@ -25,7 +25,7 @@
  * Creates fact statements about property's read-only state by using semantical information 
  * specified by @ReadOnly annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ReadOnlyPropertyFactsService extends FactsService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ReferenceValidationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ReferenceValidationService.java
index e5826c7..aee5813 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ReferenceValidationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ReferenceValidationService.java
@@ -28,7 +28,7 @@
 import org.eclipse.sapphire.services.ValidationService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ReferenceValidationService extends ValidationService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/RelativePathValidationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/RelativePathValidationService.java
index 7eca4e6..b09ece3 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/RelativePathValidationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/RelativePathValidationService.java
@@ -28,7 +28,7 @@
 import org.eclipse.sapphire.services.ServiceContext;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class RelativePathValidationService extends PathValidationService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/StandardDocumentationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/StandardDocumentationService.java
index 3c189ef..424196a 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/StandardDocumentationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/StandardDocumentationService.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.services.DocumentationService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class StandardDocumentationService extends DocumentationService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/StandardElementDocumentationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/StandardElementDocumentationService.java
index ace3f31..5d87599 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/StandardElementDocumentationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/StandardElementDocumentationService.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.services.ServiceContext;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StandardElementDocumentationService extends StandardDocumentationService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/StandardPropertyDocumentationService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/StandardPropertyDocumentationService.java
index 699a454..1bd9673 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/StandardPropertyDocumentationService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/StandardPropertyDocumentationService.java
@@ -25,7 +25,7 @@
 import org.eclipse.sapphire.services.ServiceContext;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StandardPropertyDocumentationService extends StandardDocumentationService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/StandardValueNormalizationServiceCondition.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/StandardValueNormalizationServiceCondition.java
index e0dcd17..8c80409 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/StandardValueNormalizationServiceCondition.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/StandardValueNormalizationServiceCondition.java
@@ -16,7 +16,7 @@
 import org.eclipse.sapphire.services.ServiceContext;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StandardValueNormalizationServiceCondition extends ServiceCondition
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/StaticFactsService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/StaticFactsService.java
index e832ffc..4abde22 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/StaticFactsService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/StaticFactsService.java
@@ -25,7 +25,7 @@
 /**
  * Creates fact statements about property by using static content specified in @Fact annotations.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StaticFactsService extends FactsService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/UniqueFactsService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/UniqueFactsService.java
index 8a810f7..46ce686 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/UniqueFactsService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/UniqueFactsService.java
@@ -25,7 +25,7 @@
  * Creates fact statements about value property's uniqueness constraint by using semantical 
  * information specified by @Unique annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class UniqueFactsService extends FactsService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ValidFileSystemResourceTypeFactsService.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ValidFileSystemResourceTypeFactsService.java
index 33f3501..c20e1d8 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ValidFileSystemResourceTypeFactsService.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/services/internal/ValidFileSystemResourceTypeFactsService.java
@@ -27,7 +27,7 @@
  * Creates fact statements about valid file system resource type (file or folder) for property's value 
  * by using semantical information specified by @ValidFileSystemResourceType annotation.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ValidFileSystemResourceTypeFactsService extends FactsService
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/CollectionsUtil.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/CollectionsUtil.java
index 0e7c285..4d2d7fc 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/CollectionsUtil.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/CollectionsUtil.java
@@ -16,7 +16,7 @@
 import java.util.Map;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:gregory.amerson@liferay.com">Gregory Amerson</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/Comparators.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/Comparators.java
index ad8c4e5..15bfe03 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/Comparators.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/Comparators.java
@@ -16,7 +16,7 @@
 /**
  * A collection of common comparators.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class Comparators
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/EqualsFactory.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/EqualsFactory.java
index 6ae2f48..4199b48 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/EqualsFactory.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/EqualsFactory.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.util;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class EqualsFactory
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/Filters.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/Filters.java
index e7ba5e0..d14b37a 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/Filters.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/Filters.java
@@ -16,7 +16,7 @@
 /**
  * A collection of common filters.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class Filters
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/HashCodeFactory.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/HashCodeFactory.java
index 53e27bd..d927879 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/HashCodeFactory.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/HashCodeFactory.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.util;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class HashCodeFactory
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/IdentityCache.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/IdentityCache.java
index 06a9223..7bf3b03 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/IdentityCache.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/IdentityCache.java
@@ -15,7 +15,7 @@
 import java.util.Map;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class IdentityCache<K,V>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/IdentityHashSet.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/IdentityHashSet.java
index 7988abb..8db1321 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/IdentityHashSet.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/IdentityHashSet.java
@@ -19,7 +19,7 @@
 /**
  * Identity hash set implementation based on IdentityHashMap.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class IdentityHashSet<T> extends AbstractSet<T>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/ListFactory.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/ListFactory.java
index 40b5de0..23613ab 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/ListFactory.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/ListFactory.java
@@ -20,7 +20,7 @@
 import org.eclipse.sapphire.Filter;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ListFactory<E>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/MapFactory.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/MapFactory.java
index 2ff2d0d..0a51af9 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/MapFactory.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/MapFactory.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.Filter;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class MapFactory<K,V>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/MutableReference.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/MutableReference.java
index 2039c7a..8d4af52 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/MutableReference.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/MutableReference.java
@@ -18,7 +18,7 @@
 /**
  * An object reference that can be changed after creation. 
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class MutableReference<T>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/SetFactory.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/SetFactory.java
index 9aeaa6f..3770d45 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/SetFactory.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/SetFactory.java
@@ -20,7 +20,7 @@
 import org.eclipse.sapphire.Filter;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class SetFactory<E>
diff --git a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/SortedSetFactory.java b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/SortedSetFactory.java
index af8c88b..6b45bef 100644
--- a/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/SortedSetFactory.java
+++ b/plugins/org.eclipse.sapphire.modeling/src/org/eclipse/sapphire/util/SortedSetFactory.java
@@ -24,7 +24,7 @@
 import org.eclipse.sapphire.Filter;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class SortedSetFactory<E>
diff --git a/plugins/org.eclipse.sapphire.osgi.fragment/src/org/eclipse/sapphire/modeling/BundleBasedContext.java b/plugins/org.eclipse.sapphire.osgi.fragment/src/org/eclipse/sapphire/modeling/BundleBasedContext.java
index 854e587..d2671a3 100644
--- a/plugins/org.eclipse.sapphire.osgi.fragment/src/org/eclipse/sapphire/modeling/BundleBasedContext.java
+++ b/plugins/org.eclipse.sapphire.osgi.fragment/src/org/eclipse/sapphire/modeling/BundleBasedContext.java
@@ -21,7 +21,7 @@
 /**

  * Implementation of Context based on an OSGi bundle.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class BundleBasedContext extends Context

diff --git a/plugins/org.eclipse.sapphire.osgi.fragment/src/org/eclipse/sapphire/modeling/ExtensionsLocatorFactory.java b/plugins/org.eclipse.sapphire.osgi.fragment/src/org/eclipse/sapphire/modeling/ExtensionsLocatorFactory.java
index ae38e13..185f63b 100644
--- a/plugins/org.eclipse.sapphire.osgi.fragment/src/org/eclipse/sapphire/modeling/ExtensionsLocatorFactory.java
+++ b/plugins/org.eclipse.sapphire.osgi.fragment/src/org/eclipse/sapphire/modeling/ExtensionsLocatorFactory.java
@@ -23,7 +23,7 @@
 /**
  * Locates Sapphire extensions in an OSGi system by scanning all bundles.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ExtensionsLocatorFactory extends ExtensionsLocator.Factory
diff --git a/plugins/org.eclipse.sapphire.osgi/src/org/eclipse/sapphire/osgi/BundleBasedContext.java b/plugins/org.eclipse.sapphire.osgi/src/org/eclipse/sapphire/osgi/BundleBasedContext.java
index 68d1ccd..a7e1715 100644
--- a/plugins/org.eclipse.sapphire.osgi/src/org/eclipse/sapphire/osgi/BundleBasedContext.java
+++ b/plugins/org.eclipse.sapphire.osgi/src/org/eclipse/sapphire/osgi/BundleBasedContext.java
@@ -21,7 +21,7 @@
 /**

  * Implementation of Context based on an OSGi bundle.

  * 

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class BundleBasedContext extends Context

diff --git a/plugins/org.eclipse.sapphire.osgi/src/org/eclipse/sapphire/osgi/BundleLocator.java b/plugins/org.eclipse.sapphire.osgi/src/org/eclipse/sapphire/osgi/BundleLocator.java
index d1738eb..94a30e7 100644
--- a/plugins/org.eclipse.sapphire.osgi/src/org/eclipse/sapphire/osgi/BundleLocator.java
+++ b/plugins/org.eclipse.sapphire.osgi/src/org/eclipse/sapphire/osgi/BundleLocator.java
@@ -16,7 +16,7 @@
 import org.osgi.framework.FrameworkUtil;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class BundleLocator
diff --git a/plugins/org.eclipse.sapphire.osgi/src/org/eclipse/sapphire/osgi/BundleResourceStore.java b/plugins/org.eclipse.sapphire.osgi/src/org/eclipse/sapphire/osgi/BundleResourceStore.java
index 8faef7a..a2a42ac 100644
--- a/plugins/org.eclipse.sapphire.osgi/src/org/eclipse/sapphire/osgi/BundleResourceStore.java
+++ b/plugins/org.eclipse.sapphire.osgi/src/org/eclipse/sapphire/osgi/BundleResourceStore.java
@@ -27,7 +27,7 @@
 import org.osgi.framework.Bundle;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class BundleResourceStore extends UrlResourceStore
diff --git a/plugins/org.eclipse.sapphire.platform/src/org/eclipse/sapphire/platform/PathBridge.java b/plugins/org.eclipse.sapphire.platform/src/org/eclipse/sapphire/platform/PathBridge.java
index 9f0878e..2dae812 100644
--- a/plugins/org.eclipse.sapphire.platform/src/org/eclipse/sapphire/platform/PathBridge.java
+++ b/plugins/org.eclipse.sapphire.platform/src/org/eclipse/sapphire/platform/PathBridge.java
@@ -17,7 +17,7 @@
 /**
  * Bridges between Sapphire and Eclipse path API.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class PathBridge
diff --git a/plugins/org.eclipse.sapphire.platform/src/org/eclipse/sapphire/platform/ProgressMonitorBridge.java b/plugins/org.eclipse.sapphire.platform/src/org/eclipse/sapphire/platform/ProgressMonitorBridge.java
index 6000a99..ae43fd8 100644
--- a/plugins/org.eclipse.sapphire.platform/src/org/eclipse/sapphire/platform/ProgressMonitorBridge.java
+++ b/plugins/org.eclipse.sapphire.platform/src/org/eclipse/sapphire/platform/ProgressMonitorBridge.java
@@ -17,7 +17,7 @@
 /**
  * Bridges between Sapphire and Eclipse progress monitor API.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ProgressMonitorBridge
diff --git a/plugins/org.eclipse.sapphire.platform/src/org/eclipse/sapphire/platform/StatusBridge.java b/plugins/org.eclipse.sapphire.platform/src/org/eclipse/sapphire/platform/StatusBridge.java
index b3c58a4..82108fa 100644
--- a/plugins/org.eclipse.sapphire.platform/src/org/eclipse/sapphire/platform/StatusBridge.java
+++ b/plugins/org.eclipse.sapphire.platform/src/org/eclipse/sapphire/platform/StatusBridge.java
@@ -20,7 +20,7 @@
 /**
  * Bridges between Sapphire and Eclipse status API.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StatusBridge
diff --git a/plugins/org.eclipse.sapphire.platform/src/org/eclipse/sapphire/platform/internal/PlatformLoggingService.java b/plugins/org.eclipse.sapphire.platform/src/org/eclipse/sapphire/platform/internal/PlatformLoggingService.java
index c976348..168c731 100644
--- a/plugins/org.eclipse.sapphire.platform/src/org/eclipse/sapphire/platform/internal/PlatformLoggingService.java
+++ b/plugins/org.eclipse.sapphire.platform/src/org/eclipse/sapphire/platform/internal/PlatformLoggingService.java
@@ -20,7 +20,7 @@
 /**
  * Implementation of LoggingService that writes to Eclipse platform log. 
  * 
- * @author <a href="konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class PlatformLoggingService extends LoggingService
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/address/Address.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/address/Address.java
index 2760e5e..a14e223 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/address/Address.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/address/Address.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.modeling.annotations.Service;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface Address extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/address/CityPossibleValuesService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/address/CityPossibleValuesService.java
index f60dfc3..ce55dda 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/address/CityPossibleValuesService.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/address/CityPossibleValuesService.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.samples.zipcodes.ZipCodeRepository;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class CityPossibleValuesService extends PossibleValuesService
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/address/StatePossibleValuesService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/address/StatePossibleValuesService.java
index 336c550..fcbc99e 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/address/StatePossibleValuesService.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/address/StatePossibleValuesService.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.samples.zipcodes.ZipCodeRepository;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class StatePossibleValuesService extends PossibleValuesService
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/address/ZipCodePossibleValuesService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/address/ZipCodePossibleValuesService.java
index f0d5f01..2581acb 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/address/ZipCodePossibleValuesService.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/address/ZipCodePossibleValuesService.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.samples.zipcodes.ZipCodeRepository;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ZipCodePossibleValuesService extends PossibleValuesService
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/ArchitectureSketch.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/ArchitectureSketch.java
index 15efc59..e55a04a 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/ArchitectureSketch.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/ArchitectureSketch.java
@@ -29,7 +29,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:kamesh.sampath@accenture.com">Kamesh Sampath</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/ArchitectureSketchEditor.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/ArchitectureSketchEditor.java
index 7a7b355..83c3643 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/ArchitectureSketchEditor.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/ArchitectureSketchEditor.java
@@ -22,7 +22,7 @@
 import org.eclipse.wst.sse.ui.StructuredTextEditor;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:shenxue.zhou@oracle.com">Shenxue Zhou</a>
  * @author <a href="mailto:gregory.amerson@liferay.com">Gregory Amerson</a>
  */
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/Component.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/Component.java
index 867dd99..174c0ac 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/Component.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/Component.java
@@ -28,7 +28,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface Component extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/ComponentDependency.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/ComponentDependency.java
index f1fdfad..ae3ccd3 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/ComponentDependency.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/ComponentDependency.java
@@ -28,7 +28,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface ComponentDependency extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/CreateArchitectureSketchOp.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/CreateArchitectureSketchOp.java
index 37d63b9..09fbeaa 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/CreateArchitectureSketchOp.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/CreateArchitectureSketchOp.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.workspace.WorkspaceFileType;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @WorkspaceFileType( ArchitectureSketch.class )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/internal/ArchitectureDiagramLayoutPersistenceService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/internal/ArchitectureDiagramLayoutPersistenceService.java
index 8cd4d65..1b23f2a 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/internal/ArchitectureDiagramLayoutPersistenceService.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/architecture/internal/ArchitectureDiagramLayoutPersistenceService.java
@@ -54,7 +54,7 @@
 
 /**
  * @author <a href="mailto:shenxue.zhou@oracle.com">Shenxue Zhou</a>
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:ling.hao@oracle.com">Ling Hao</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/AttendeeType.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/AttendeeType.java
index 7f9615e..6f7688c 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/AttendeeType.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/AttendeeType.java
@@ -14,7 +14,7 @@
 import org.eclipse.sapphire.modeling.annotations.Label;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Label( standard = "attendee type" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/IAttendee.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/IAttendee.java
index 30e2bf2..f053d3f 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/IAttendee.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/IAttendee.java
@@ -23,7 +23,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Image( path = "org/eclipse/sapphire/samples/contacts/Contact.png" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/ICalendar.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/ICalendar.java
index 3b29782..4450fd6 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/ICalendar.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/ICalendar.java
@@ -23,7 +23,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlSchema;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:kamesh.sampath@accenture.com">Kamesh Sampath</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/IEvent.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/IEvent.java
index 29a15df..ef1dd79 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/IEvent.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/IEvent.java
@@ -25,7 +25,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IEvent extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/IEventAttachment.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/IEventAttachment.java
index b5f04ea..8742bba 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/IEventAttachment.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/IEventAttachment.java
@@ -28,7 +28,7 @@
 import org.eclipse.sapphire.samples.calendar.internal.EventAttachmentLocalCopyRelativePathService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IEventAttachment extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/CalendarEditor.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/CalendarEditor.java
index 86cf62d..053e5a5 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/CalendarEditor.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/CalendarEditor.java
@@ -36,7 +36,7 @@
 import org.eclipse.wst.sse.ui.StructuredTextEditor;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:gregory.amerson@liferay.com">Gregory Amerson</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/CalendarResourceConversionService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/CalendarResourceConversionService.java
index 7d410fd..a91146d 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/CalendarResourceConversionService.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/CalendarResourceConversionService.java
@@ -22,7 +22,7 @@
  * Implementation of ConversionService that is capable of converting an IFile to a Resource for the 
  * calendar sample.
  * 
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class CalendarResourceConversionService extends ConversionService<IFile,Resource>
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/CreateCalendarOp.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/CreateCalendarOp.java
index e548c11..5b506b0 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/CreateCalendarOp.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/CreateCalendarOp.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.workspace.WorkspaceFileType;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @WorkspaceFileType( ICalendar.class )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/IAttendee.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/IAttendee.java
index 51ead1c..1bcdec4 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/IAttendee.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/IAttendee.java
@@ -25,7 +25,7 @@
 import org.eclipse.sapphire.samples.calendar.integrated.internal.AttendeeImageService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Service( impl = AttendeeImageService.class )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/ICalendar.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/ICalendar.java
index 9d20f79..e4a01a9 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/ICalendar.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/ICalendar.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.modeling.annotations.Service;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Service
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/IEvent.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/IEvent.java
index e96632d..a71fcaf 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/IEvent.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/IEvent.java
@@ -23,7 +23,7 @@
 import org.eclipse.sapphire.modeling.annotations.Required;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IEvent extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/IEventAttachment.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/IEventAttachment.java
index 5906547..5289baf 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/IEventAttachment.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/IEventAttachment.java
@@ -27,7 +27,7 @@
 import org.eclipse.sapphire.samples.calendar.internal.EventAttachmentLocalCopyRelativePathService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IEventAttachment extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/internal/AttendeeImageService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/internal/AttendeeImageService.java
index b14f3e2..0fbce45 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/internal/AttendeeImageService.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/internal/AttendeeImageService.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.samples.contacts.Contact;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class AttendeeImageService extends ImageService
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/internal/AttendeeResource.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/internal/AttendeeResource.java
index 267d91a..fcd0d1c 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/internal/AttendeeResource.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/internal/AttendeeResource.java
@@ -24,7 +24,7 @@
 import org.eclipse.sapphire.samples.contacts.ContactRepository;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class AttendeeResource extends Resource
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/internal/CalendarResource.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/internal/CalendarResource.java
index b5b8429..14d727b 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/internal/CalendarResource.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/internal/CalendarResource.java
@@ -30,7 +30,7 @@
 import org.eclipse.sapphire.samples.contacts.ContactRepository;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class CalendarResource extends Resource
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/internal/EventAttachmentResource.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/internal/EventAttachmentResource.java
index e3b8d0d..93c2296 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/internal/EventAttachmentResource.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/internal/EventAttachmentResource.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.samples.calendar.integrated.IEventAttachment;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class EventAttachmentResource extends Resource
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/internal/EventResource.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/internal/EventResource.java
index f6ae13e..68848c7 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/internal/EventResource.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/integrated/internal/EventResource.java
@@ -30,7 +30,7 @@
 import org.eclipse.sapphire.samples.calendar.integrated.IEventAttachment;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class EventResource extends Resource
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/internal/EventAttachmentLocalCopyRelativePathService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/internal/EventAttachmentLocalCopyRelativePathService.java
index 335900d..7998e22 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/internal/EventAttachmentLocalCopyRelativePathService.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/internal/EventAttachmentLocalCopyRelativePathService.java
@@ -20,7 +20,7 @@
 import org.eclipse.sapphire.services.RelativePathService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class EventAttachmentLocalCopyRelativePathService extends RelativePathService
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/ui/ContactDetailsJumpHandler.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/ui/ContactDetailsJumpHandler.java
index 6639326..111bcee 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/ui/ContactDetailsJumpHandler.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/ui/ContactDetailsJumpHandler.java
@@ -24,7 +24,7 @@
 import org.eclipse.sapphire.ui.forms.MasterDetailsEditorPagePart;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ContactDetailsJumpHandler extends JumpActionHandler
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/ui/SendMailActionContributor.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/ui/SendMailActionContributor.java
index 2a52f3c..383e59c 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/ui/SendMailActionContributor.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/ui/SendMailActionContributor.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.ui.assist.PropertyEditorAssistSection;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class SendMailActionContributor extends PropertyEditorAssistContributor
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/ui/ShowContactDetailsActionHandler.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/ui/ShowContactDetailsActionHandler.java
index 9d1c6cc..ec2cd47 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/ui/ShowContactDetailsActionHandler.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/calendar/ui/ShowContactDetailsActionHandler.java
@@ -25,7 +25,7 @@
 import org.eclipse.sapphire.ui.def.ActionHandlerDef;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ShowContactDetailsActionHandler extends SapphireActionHandler
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/Catalog.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/Catalog.java
index fcaf591..4bdfc64 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/Catalog.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/Catalog.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;

 

 /**

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 @XmlBinding( path = "Catalog" )

diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/CatalogEditorPageState.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/CatalogEditorPageState.java
index 90d8aaa..b245c57 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/CatalogEditorPageState.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/CatalogEditorPageState.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.ui.forms.MasterDetailsEditorPageState;

 

 /**

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public interface CatalogEditorPageState extends MasterDetailsEditorPageState

diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/CategoriesBinding.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/CategoriesBinding.java
index 6c588ee..d6f1ae9 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/CategoriesBinding.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/CategoriesBinding.java
@@ -39,7 +39,7 @@
 import org.eclipse.sapphire.util.ListFactory;

 

 /**

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class CategoriesBinding extends ListPropertyBinding

diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/Category.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/Category.java
index 9b990fe..d4b16de 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/Category.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/Category.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;

 

 /**

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public interface Category extends Element

diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/CreateCatalogOp.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/CreateCatalogOp.java
index f3c35b9..75a38d0 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/CreateCatalogOp.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/CreateCatalogOp.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.workspace.WorkspaceFileType;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @WorkspaceFileType( Catalog.class )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/Item.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/Item.java
index 47ff212..1d12324 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/Item.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/Item.java
@@ -23,7 +23,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;

 

 /**

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public interface Item extends Element

diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ItemImageFunction.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ItemImageFunction.java
index ece2b05..0e9304e 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ItemImageFunction.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ItemImageFunction.java
@@ -28,7 +28,7 @@
 import org.eclipse.sapphire.ui.forms.MasterDetailsEditorPageState;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ItemImageFunction extends Function
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ItemVariant.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ItemVariant.java
index 6fea54d..6a9d4e9 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ItemVariant.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ItemVariant.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;

 

 /**

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public interface ItemVariant extends Priced

diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/Manufacturer.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/Manufacturer.java
index f29c85b..4593fe2 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/Manufacturer.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/Manufacturer.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;

 

 /**

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public interface Manufacturer extends Element

diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ManufacturersBinding.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ManufacturersBinding.java
index 8aec78d..4c6b9be 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ManufacturersBinding.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ManufacturersBinding.java
@@ -39,7 +39,7 @@
 import org.eclipse.sapphire.util.ListFactory;

 

 /**

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public final class ManufacturersBinding extends ListPropertyBinding

diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/MultiVariantItem.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/MultiVariantItem.java
index 3fdf391..a07f3cc 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/MultiVariantItem.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/MultiVariantItem.java
@@ -20,7 +20,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;

 

 /**

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 @Label( standard = "multi-variant item" )

diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/Priced.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/Priced.java
index 093af82..7c849f9 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/Priced.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/Priced.java
@@ -25,7 +25,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;

 

 /**

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 public interface Priced extends Element

diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ShowManufacturerActionHandler.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ShowManufacturerActionHandler.java
index cf4b999..d45e702 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ShowManufacturerActionHandler.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ShowManufacturerActionHandler.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.ui.def.ActionHandlerDef;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ShowManufacturerActionHandler extends SapphireActionHandler 
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ShowManufacturerColorActionHandler.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ShowManufacturerColorActionHandler.java
index f5fce8c..e44a88d 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ShowManufacturerColorActionHandler.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ShowManufacturerColorActionHandler.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.ui.def.ActionHandlerDef;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ShowManufacturerColorActionHandler extends SapphireActionHandler 
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ShowPriceActionHandler.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ShowPriceActionHandler.java
index fe0b204..c89c523 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ShowPriceActionHandler.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/ShowPriceActionHandler.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.ui.def.ActionHandlerDef;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ShowPriceActionHandler extends SapphireActionHandler 
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/SingleVariantItem.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/SingleVariantItem.java
index 6d4f6a6..6a91aaf 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/SingleVariantItem.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/catalog/SingleVariantItem.java
@@ -15,7 +15,7 @@
 import org.eclipse.sapphire.modeling.annotations.Label;

 

 /**

- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>

  */

 

 @Label( standard = "item" )

diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/Assistant.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/Assistant.java
index c958e35..6bab9a2 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/Assistant.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/Assistant.java
@@ -29,7 +29,7 @@
 import org.eclipse.sapphire.samples.contacts.internal.AssistantNameValidationService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Image( path = "Contact.png" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/AssistantTask.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/AssistantTask.java
index ba8585f..fa8637c 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/AssistantTask.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/AssistantTask.java
@@ -20,7 +20,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Label( standard = "delegated task" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/Connection.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/Connection.java
index 90047d5..d9db27f 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/Connection.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/Connection.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.modeling.annotations.Required;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Image( path = "Contact.png" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/Contact.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/Contact.java
index 3f503d7..1e07f56 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/Contact.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/Contact.java
@@ -40,7 +40,7 @@
 import org.eclipse.sapphire.samples.contacts.internal.ContactMethods;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Image( path = "Contact.png" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/ContactAddress.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/ContactAddress.java
index 95bee19..c952ca7 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/ContactAddress.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/ContactAddress.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.samples.address.Address;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Label( standard = "address" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/ContactRepository.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/ContactRepository.java
index 0daff10..f525929 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/ContactRepository.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/ContactRepository.java
@@ -25,7 +25,7 @@
 import org.eclipse.sapphire.samples.contacts.internal.ContactRepositoryImageService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:kamesh.sampath@accenture.com">Kamesh Sampath</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/CreateContactRepositoryOp.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/CreateContactRepositoryOp.java
index 295c11c..b518fe3 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/CreateContactRepositoryOp.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/CreateContactRepositoryOp.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.workspace.WorkspaceFileType;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @WorkspaceFileType( ContactRepository.class )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/HomemakerOccupation.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/HomemakerOccupation.java
index 5ec9a37..a148574 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/HomemakerOccupation.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/HomemakerOccupation.java
@@ -15,7 +15,7 @@
 import org.eclipse.sapphire.modeling.annotations.Label;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Label( standard = "homemaker" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/JobOccupation.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/JobOccupation.java
index 83e5e37..cf7f497 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/JobOccupation.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/JobOccupation.java
@@ -23,7 +23,7 @@
 import org.eclipse.sapphire.samples.contacts.internal.ManagerNameValidationService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Label( standard = "job" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/Occupation.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/Occupation.java
index b808418..86b7190 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/Occupation.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/Occupation.java
@@ -15,7 +15,7 @@
 import org.eclipse.sapphire.ElementType;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface Occupation extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/PhoneNumber.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/PhoneNumber.java
index 012f8ad..2b46a23 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/PhoneNumber.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/PhoneNumber.java
@@ -26,7 +26,7 @@
 import org.eclipse.sapphire.samples.contacts.internal.LocalNumberBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface PhoneNumber extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/SendContactOp.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/SendContactOp.java
index 652c09c..ddc3a51 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/SendContactOp.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/SendContactOp.java
@@ -30,7 +30,7 @@
 import org.eclipse.sapphire.samples.contacts.internal.SendContactToPossibleValuesService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface SendContactOp extends ExecutableElement
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/StudentOccupation.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/StudentOccupation.java
index 1de7b59..fdd361a 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/StudentOccupation.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/StudentOccupation.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Label( standard = "student" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/WebSite.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/WebSite.java
index fc4b420..7d6ae67 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/WebSite.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/WebSite.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Image( path = "org/eclipse/sapphire/samples/Web.png" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/AreaCodeBinding.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/AreaCodeBinding.java
index 39c165b..3152801 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/AreaCodeBinding.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/AreaCodeBinding.java
@@ -16,7 +16,7 @@
 import org.eclipse.sapphire.modeling.xml.XmlResource;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class AreaCodeBinding extends ValuePropertyBinding
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/AssistantNameValidationService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/AssistantNameValidationService.java
index b9f3d07..4b73009 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/AssistantNameValidationService.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/AssistantNameValidationService.java
@@ -16,7 +16,7 @@
 import org.eclipse.sapphire.modeling.Status;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class AssistantNameValidationService extends ConnectionNameValidationService
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ConnectionNameValidationService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ConnectionNameValidationService.java
index 9d9aa4c..4eb151d 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ConnectionNameValidationService.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ConnectionNameValidationService.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.services.ValidationService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public abstract class ConnectionNameValidationService extends ValidationService
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ConnectionsListBinding.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ConnectionsListBinding.java
index 5a524d2..4b13c5e 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ConnectionsListBinding.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ConnectionsListBinding.java
@@ -17,7 +17,7 @@
 import org.eclipse.sapphire.samples.contacts.Contact;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ConnectionsListBinding extends XmlDelimitedListBindingImpl
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactCategoryPossibleValueService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactCategoryPossibleValueService.java
index 192ce69..71edb85 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactCategoryPossibleValueService.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactCategoryPossibleValueService.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.samples.contacts.ContactRepository;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ContactCategoryPossibleValueService extends PossibleValuesService
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactEqualityService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactEqualityService.java
index 96b9560..9edabed 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactEqualityService.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactEqualityService.java
@@ -17,7 +17,7 @@
 import org.eclipse.sapphire.services.EqualityService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ContactEqualityService extends EqualityService
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactImageService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactImageService.java
index 56c005a..17e8fbf 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactImageService.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactImageService.java
@@ -20,7 +20,7 @@
 import org.eclipse.sapphire.samples.contacts.Contact;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ContactImageService extends ImageService
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactMethods.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactMethods.java
index 36e83f4..e8b8c49 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactMethods.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactMethods.java
@@ -16,7 +16,7 @@
 import org.eclipse.sapphire.samples.contacts.PhoneNumber;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ContactMethods
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactNamePossibleValuesService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactNamePossibleValuesService.java
index 6437e8c..f9f15f5 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactNamePossibleValuesService.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactNamePossibleValuesService.java
@@ -18,7 +18,7 @@
 import org.eclipse.sapphire.samples.contacts.ContactRepository;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ContactNamePossibleValuesService extends PossibleValuesService
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactRepositoryImageService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactRepositoryImageService.java
index 8ba0a6a..7ef6a7a 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactRepositoryImageService.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ContactRepositoryImageService.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.samples.contacts.ContactRepository;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ContactRepositoryImageService extends ImageService
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/CreateContactActionHandler.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/CreateContactActionHandler.java
index 9b4a050..52568fd 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/CreateContactActionHandler.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/CreateContactActionHandler.java
@@ -26,7 +26,7 @@
 import org.eclipse.sapphire.ui.forms.PropertyEditorPart;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class CreateContactActionHandler extends SapphireActionHandler
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/LocalNumberBinding.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/LocalNumberBinding.java
index 1974237..2a28504 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/LocalNumberBinding.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/LocalNumberBinding.java
@@ -16,7 +16,7 @@
 import org.eclipse.sapphire.modeling.xml.XmlResource;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class LocalNumberBinding extends ValuePropertyBinding
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ManagerNameValidationService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ManagerNameValidationService.java
index 35431e1..74a33e0 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ManagerNameValidationService.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ManagerNameValidationService.java
@@ -16,7 +16,7 @@
 import org.eclipse.sapphire.modeling.Status;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ManagerNameValidationService extends ConnectionNameValidationService
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ParsedPhoneNumber.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ParsedPhoneNumber.java
index aec47f5..0dbeeea 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ParsedPhoneNumber.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/ParsedPhoneNumber.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.samples.contacts.internal;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ParsedPhoneNumber
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/SendContactActionHandler.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/SendContactActionHandler.java
index 2cdc6da..356987d 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/SendContactActionHandler.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/SendContactActionHandler.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.ui.forms.swt.SapphireWizard;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class SendContactActionHandler extends SapphireActionHandler
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/SendContactOpMessageBodyDerivedValueService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/SendContactOpMessageBodyDerivedValueService.java
index a93d728..3930a7f 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/SendContactOpMessageBodyDerivedValueService.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/SendContactOpMessageBodyDerivedValueService.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.samples.contacts.SendContactOp;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class SendContactOpMessageBodyDerivedValueService extends DerivedValueService
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/SendContactOpMethods.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/SendContactOpMethods.java
index bd6ac31..6eeae8b 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/SendContactOpMethods.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/SendContactOpMethods.java
@@ -16,7 +16,7 @@
 import org.eclipse.sapphire.samples.contacts.SendContactOp;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class SendContactOpMethods
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/SendContactToPossibleValuesService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/SendContactToPossibleValuesService.java
index 57f7e5f..a1bc6aa 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/SendContactToPossibleValuesService.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/internal/SendContactToPossibleValuesService.java
@@ -20,7 +20,7 @@
 import org.eclipse.sapphire.samples.contacts.SendContactOp;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class SendContactToPossibleValuesService extends PossibleValuesService
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/ui/internal/WebSiteUrlBrowseHandler.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/ui/internal/WebSiteUrlBrowseHandler.java
index 133ccf6..44b64f0 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/ui/internal/WebSiteUrlBrowseHandler.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/contacts/ui/internal/WebSiteUrlBrowseHandler.java
@@ -29,7 +29,7 @@
 import org.eclipse.swt.widgets.Text;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class WebSiteUrlBrowseHandler extends BrowseActionHandler
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/BugReport.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/BugReport.java
index bd814b0..96f035b 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/BugReport.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/BugReport.java
@@ -26,7 +26,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface BugReport extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/BugRepository.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/BugRepository.java
index 550f070..f152140 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/BugRepository.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/BugRepository.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:kamesh.sampath@accenture.com">Kamesh Sampath</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/CreateBugRepositoryOp.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/CreateBugRepositoryOp.java
index daeb685..1e024e6 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/CreateBugRepositoryOp.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/CreateBugRepositoryOp.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.workspace.WorkspaceFileType;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @WorkspaceFileType( BugRepository.class )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/FileBugReportOp.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/FileBugReportOp.java
index b299041..bcfb8bf 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/FileBugReportOp.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/FileBugReportOp.java
@@ -24,7 +24,7 @@
 import org.eclipse.sapphire.samples.ezbug.internal.FileBugReportOpMethods;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:kamesh.sampath@accenture.com">Kamesh Sampath</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/HardwareItem.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/HardwareItem.java
index 9514140..cd17a76 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/HardwareItem.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/HardwareItem.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface HardwareItem extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/HardwareType.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/HardwareType.java
index d863e75..7278255 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/HardwareType.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/HardwareType.java
@@ -15,7 +15,7 @@
 import org.eclipse.sapphire.modeling.annotations.Label;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Label( standard = "type", full = "hardware type" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ProductStage.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ProductStage.java
index 1ca2503..7250808 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ProductStage.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ProductStage.java
@@ -14,7 +14,7 @@
 import org.eclipse.sapphire.modeling.annotations.Label;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Label( standard = "product stage" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ProductVersion.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ProductVersion.java
index 49233e7..08c68a0 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ProductVersion.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ProductVersion.java
@@ -15,7 +15,7 @@
 import org.eclipse.sapphire.modeling.annotations.Label;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Label( standard = "product version" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/internal/FileBugReportOpMethods.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/internal/FileBugReportOpMethods.java
index ab92b0f..fe0e11a 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/internal/FileBugReportOpMethods.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/internal/FileBugReportOpMethods.java
@@ -16,7 +16,7 @@
 import org.eclipse.sapphire.samples.ezbug.FileBugReportOp;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class FileBugReportOpMethods
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ui/FileBugReportHandler1.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ui/FileBugReportHandler1.java
index cb33dfa..927aef6 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ui/FileBugReportHandler1.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ui/FileBugReportHandler1.java
@@ -21,7 +21,7 @@
 import org.eclipse.ui.handlers.HandlerUtil;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class FileBugReportHandler1 extends AbstractHandler
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ui/FileBugReportHandler2.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ui/FileBugReportHandler2.java
index 9b18c18..b6c2d4a 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ui/FileBugReportHandler2.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ui/FileBugReportHandler2.java
@@ -21,7 +21,7 @@
 import org.eclipse.ui.handlers.HandlerUtil;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class FileBugReportHandler2 extends AbstractHandler
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ui/FileBugReportHandler3.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ui/FileBugReportHandler3.java
index b2ec89e..6d366cf 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ui/FileBugReportHandler3.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ui/FileBugReportHandler3.java
@@ -21,7 +21,7 @@
 import org.eclipse.ui.handlers.HandlerUtil;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class FileBugReportHandler3 extends AbstractHandler
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ui/FileBugReportHandler4.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ui/FileBugReportHandler4.java
index 1a3e1f6..d7a0481 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ui/FileBugReportHandler4.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ui/FileBugReportHandler4.java
@@ -18,7 +18,7 @@
 import org.eclipse.ui.handlers.HandlerUtil;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class FileBugReportHandler4 extends AbstractHandler
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ui/FileBugReportView.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ui/FileBugReportView.java
index 2f3d0f0..09fbb89 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ui/FileBugReportView.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/ezbug/ui/FileBugReportView.java
@@ -22,7 +22,7 @@
 import org.eclipse.ui.part.ViewPart;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class FileBugReportView extends ViewPart
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ActuatorsGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ActuatorsGallery.java
index 695c07c..62b998e 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ActuatorsGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ActuatorsGallery.java
@@ -20,7 +20,7 @@
 import org.eclipse.sapphire.modeling.annotations.Label;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface ActuatorsGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/AncestorAccessGalleryLevel1.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/AncestorAccessGalleryLevel1.java
index 98994eb..67023a4 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/AncestorAccessGalleryLevel1.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/AncestorAccessGalleryLevel1.java
@@ -23,7 +23,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface AncestorAccessGalleryLevel1 extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/AncestorAccessGalleryLevel2.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/AncestorAccessGalleryLevel2.java
index 7c2de63..db4aa97 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/AncestorAccessGalleryLevel2.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/AncestorAccessGalleryLevel2.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface AncestorAccessGalleryLevel2 extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/AncestorAccessGalleryLevel3.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/AncestorAccessGalleryLevel3.java
index f6aca56..765ed49 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/AncestorAccessGalleryLevel3.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/AncestorAccessGalleryLevel3.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface AncestorAccessGalleryLevel3 extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/Circle.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/Circle.java
index a41c204..69a96d9 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/Circle.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/Circle.java
@@ -12,7 +12,7 @@
 package org.eclipse.sapphire.samples.gallery;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class Circle
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/Color.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/Color.java
index 1aba20c..ad737f8 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/Color.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/Color.java
@@ -16,7 +16,7 @@
 import org.eclipse.sapphire.modeling.annotations.Label;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Label( standard = "color" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/CreateGalleryOp.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/CreateGalleryOp.java
index 38d0c02..233b347 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/CreateGalleryOp.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/CreateGalleryOp.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.workspace.WorkspaceFileType;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @WorkspaceFileType( IGallery.class )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/CustomColor.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/CustomColor.java
index f9f58ad..7fa2be4 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/CustomColor.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/CustomColor.java
@@ -18,7 +18,7 @@
 import org.eclipse.sapphire.modeling.annotations.Required;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface CustomColor extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/DefaultValueGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/DefaultValueGallery.java
index 71c81e4..177df91 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/DefaultValueGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/DefaultValueGallery.java
@@ -18,7 +18,7 @@
 import org.eclipse.sapphire.modeling.annotations.DefaultValue;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface DefaultValueGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ElementPropertyCustomGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ElementPropertyCustomGallery.java
index c90b953..17a81d6 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ElementPropertyCustomGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ElementPropertyCustomGallery.java
@@ -26,7 +26,7 @@
 import org.eclipse.sapphire.samples.gallery.internal.ElementPropertyCustomGalleryServices;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface ElementPropertyCustomGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IBigDecimalValueGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IBigDecimalValueGallery.java
index 9c79902..5f49238 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IBigDecimalValueGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IBigDecimalValueGallery.java
@@ -24,7 +24,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IBigDecimalValueGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IBigIntegerValueGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IBigIntegerValueGallery.java
index 0078445..748f4da 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IBigIntegerValueGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IBigIntegerValueGallery.java
@@ -24,7 +24,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IBigIntegerValueGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IBooleanValueGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IBooleanValueGallery.java
index 354b50c..a2e6729 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IBooleanValueGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IBooleanValueGallery.java
@@ -20,7 +20,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IBooleanValueGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IBrowseSupportGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IBrowseSupportGallery.java
index 0327b17..56413bc 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IBrowseSupportGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IBrowseSupportGallery.java
@@ -34,7 +34,7 @@
 import org.eclipse.sapphire.workspace.WorkspaceRelativePath;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IBrowseSupportGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IBrowseSupportGalleryListEntry.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IBrowseSupportGalleryListEntry.java
index bf775a6..aa9c6ce 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IBrowseSupportGalleryListEntry.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IBrowseSupportGalleryListEntry.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IBrowseSupportGalleryListEntry extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IChildElement.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IChildElement.java
index 1e9ba4a..f2fa543 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IChildElement.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IChildElement.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IChildElement extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IChildElementWithEnum.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IChildElementWithEnum.java
index 8fb53ea..3389376 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IChildElementWithEnum.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IChildElementWithEnum.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IChildElementWithEnum extends IChildElement
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IChildElementWithInteger.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IChildElementWithInteger.java
index 61c9c56..4e446f2 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IChildElementWithInteger.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IChildElementWithInteger.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IChildElementWithInteger extends IChildElement
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ICustomValueGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ICustomValueGallery.java
index 3fabc03..f7a3a7e 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ICustomValueGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ICustomValueGallery.java
@@ -23,7 +23,7 @@
 import org.eclipse.sapphire.samples.gallery.internal.StringToRectangleConversionService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface ICustomValueGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IDoubleValueGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IDoubleValueGallery.java
index 1b442e7..8537fe3 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IDoubleValueGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IDoubleValueGallery.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IDoubleValueGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IElementPropertiesGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IElementPropertiesGallery.java
index 5ded420..e22816c 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IElementPropertiesGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IElementPropertiesGallery.java
@@ -24,7 +24,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlElementBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IElementPropertiesGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IEnablementGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IEnablementGallery.java
index e860916..71bfa26 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IEnablementGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IEnablementGallery.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IEnablementGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IEnumValueGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IEnumValueGallery.java
index b937a4e..ed4bf2d 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IEnumValueGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IEnumValueGallery.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IEnumValueGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IFloatValueGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IFloatValueGallery.java
index e954911..ad6b35e 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IFloatValueGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IFloatValueGallery.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IFloatValueGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IGallery.java
index 7d55a6b..878d522 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IGallery.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  * @author <a href="mailto:kamesh.sampath@accenture.com">Kamesh Sampath</a>
  */
 
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IHtmlContentGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IHtmlContentGallery.java
index c3eaaff..d846ce7 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IHtmlContentGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IHtmlContentGallery.java
@@ -20,7 +20,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IHtmlContentGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IIntegerValueGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IIntegerValueGallery.java
index df92b67..4b6eaf1 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IIntegerValueGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IIntegerValueGallery.java
@@ -23,7 +23,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IIntegerValueGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IJavaTypeNameValueGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IJavaTypeNameValueGallery.java
index 0ea717d..7cb0a60 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IJavaTypeNameValueGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IJavaTypeNameValueGallery.java
@@ -29,7 +29,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IJavaTypeNameValueGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IListItemWithJavaType.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IListItemWithJavaType.java
index d04eec1..7579384 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IListItemWithJavaType.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IListItemWithJavaType.java
@@ -23,7 +23,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Label( standard = "item" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ILongIntegerValueGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ILongIntegerValueGallery.java
index eec4bfd..2913611 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ILongIntegerValueGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ILongIntegerValueGallery.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface ILongIntegerValueGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IRelatedContentGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IRelatedContentGallery.java
index ede0e59..cd349ed 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IRelatedContentGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IRelatedContentGallery.java
@@ -24,7 +24,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlValueBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IRelatedContentGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ISectionsGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ISectionsGallery.java
index 55709ad..aa3cd52 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ISectionsGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ISectionsGallery.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface ISectionsGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ITabGroupGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ITabGroupGallery.java
index 14b3a09..b9358fc 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ITabGroupGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ITabGroupGallery.java
@@ -23,7 +23,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface ITabGroupGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IValuePropertiesGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IValuePropertiesGallery.java
index c4e890e..f89a50d 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IValuePropertiesGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IValuePropertiesGallery.java
@@ -22,7 +22,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IValuePropertiesGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IValuePropertyActionsGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IValuePropertyActionsGallery.java
index 052d7aa..ac08a02 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IValuePropertyActionsGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IValuePropertyActionsGallery.java
@@ -25,7 +25,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IValuePropertyActionsGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IValuePropertyActionsGalleryEntity.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IValuePropertyActionsGalleryEntity.java
index bd1e18b..ca344a8 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IValuePropertyActionsGalleryEntity.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IValuePropertyActionsGalleryEntity.java
@@ -20,7 +20,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlValueBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IValuePropertyActionsGalleryEntity extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IValuePropertyActionsGalleryReference.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IValuePropertyActionsGalleryReference.java
index 7ba8d3e..070de95 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IValuePropertyActionsGalleryReference.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IValuePropertyActionsGalleryReference.java
@@ -20,7 +20,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlValueBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Label( standard = "reference" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IWhitespaceHandlingGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IWhitespaceHandlingGallery.java
index e983775..b620e09 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IWhitespaceHandlingGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/IWhitespaceHandlingGallery.java
@@ -20,7 +20,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface IWhitespaceHandlingGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/InitialValueGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/InitialValueGallery.java
index 095193c..b26e5f5 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/InitialValueGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/InitialValueGallery.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface InitialValueGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ListPropertiesGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ListPropertiesGallery.java
index 1676f6d..5e6f50f 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ListPropertiesGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ListPropertiesGallery.java
@@ -32,7 +32,7 @@
 import org.eclipse.sapphire.samples.gallery.internal.ColorValueLabelService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface ListPropertiesGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ListPropertyCustomGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ListPropertyCustomGallery.java
index 9da015c..2bc6d66 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ListPropertyCustomGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ListPropertyCustomGallery.java
@@ -26,7 +26,7 @@
 import org.eclipse.sapphire.samples.gallery.internal.ListPropertyCustomGalleryServices;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface ListPropertyCustomGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/NestedPropertiesInListGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/NestedPropertiesInListGallery.java
index 202cbdc..99d7846 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/NestedPropertiesInListGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/NestedPropertiesInListGallery.java
@@ -25,7 +25,7 @@
 import org.eclipse.sapphire.modeling.annotations.Required;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface NestedPropertiesInListGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/PossibleValuesGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/PossibleValuesGallery.java
index 4cbc3fd..d625241 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/PossibleValuesGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/PossibleValuesGallery.java
@@ -31,7 +31,7 @@
 import org.eclipse.sapphire.samples.gallery.internal.ColorValueLabelService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface PossibleValuesGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/PossibleValuesGalleryListItem.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/PossibleValuesGalleryListItem.java
index 51ff7fd..23f1480 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/PossibleValuesGalleryListItem.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/PossibleValuesGalleryListItem.java
@@ -27,7 +27,7 @@
 import org.eclipse.sapphire.samples.gallery.internal.ColorValueLabelService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface PossibleValuesGalleryListItem extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/Rectangle.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/Rectangle.java
index d120b37..aa323a4 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/Rectangle.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/Rectangle.java
@@ -14,7 +14,7 @@
 import org.eclipse.sapphire.modeling.annotations.Label;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Label( standard = "rectangle" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ShapeType.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ShapeType.java
index 940b96e..da196e8 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ShapeType.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ShapeType.java
@@ -14,7 +14,7 @@
 import org.eclipse.sapphire.modeling.annotations.Label;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Label( standard = "shape type" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/SizeUnits.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/SizeUnits.java
index 917ff38..4c3ee03 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/SizeUnits.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/SizeUnits.java
@@ -14,7 +14,7 @@
 import org.eclipse.sapphire.modeling.annotations.Label;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Label( standard = "size units" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/SplitFormGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/SplitFormGallery.java
index d2ea688..0508760 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/SplitFormGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/SplitFormGallery.java
@@ -23,7 +23,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface SplitFormGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/SplitFormGalleryListEntry.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/SplitFormGalleryListEntry.java
index 5d766c4..4a45f4f 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/SplitFormGalleryListEntry.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/SplitFormGalleryListEntry.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface SplitFormGalleryListEntry extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/StringValueElement.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/StringValueElement.java
index 5051085..96270e5 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/StringValueElement.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/StringValueElement.java
@@ -17,7 +17,7 @@
 import org.eclipse.sapphire.ValueProperty;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface StringValueElement extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ThreeChoiceAnswer.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ThreeChoiceAnswer.java
index 5101356..56dc113 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ThreeChoiceAnswer.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ThreeChoiceAnswer.java
@@ -14,7 +14,7 @@
 import org.eclipse.sapphire.modeling.annotations.Label;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Label( standard = "three choice answer" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ThreeChoiceAnswerCustomized.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ThreeChoiceAnswerCustomized.java
index 28ed2f0..52670ef 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ThreeChoiceAnswerCustomized.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/ThreeChoiceAnswerCustomized.java
@@ -15,7 +15,7 @@
 import org.eclipse.sapphire.modeling.annotations.Label;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 @Label( standard = "three choice answer" )
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/VisibleWhenGallery.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/VisibleWhenGallery.java
index 90bd5e5..c3eba05 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/VisibleWhenGallery.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/VisibleWhenGallery.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.modeling.annotations.DefaultValue;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public interface VisibleWhenGallery extends Element
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ActuatorsGalleryDoubleTheNumberActionHandler.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ActuatorsGalleryDoubleTheNumberActionHandler.java
index 0b98eed..6688fc1 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ActuatorsGalleryDoubleTheNumberActionHandler.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ActuatorsGalleryDoubleTheNumberActionHandler.java
@@ -16,7 +16,7 @@
 import org.eclipse.sapphire.ui.SapphireActionHandler;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ActuatorsGalleryDoubleTheNumberActionHandler extends SapphireActionHandler
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/CircleToStringConversionService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/CircleToStringConversionService.java
index 6791ed6..ec02e7f 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/CircleToStringConversionService.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/CircleToStringConversionService.java
@@ -15,7 +15,7 @@
 import org.eclipse.sapphire.samples.gallery.Circle;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class CircleToStringConversionService extends ConversionService<Circle,String>
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ColorPossibleValuesService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ColorPossibleValuesService.java
index 56b0dff..b5df152 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ColorPossibleValuesService.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ColorPossibleValuesService.java
@@ -21,7 +21,7 @@
 import org.eclipse.sapphire.samples.gallery.IGallery;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ColorPossibleValuesService extends PossibleValuesService
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ColorValueImageService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ColorValueImageService.java
index fc2f5df..280eaf0 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ColorValueImageService.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ColorValueImageService.java
@@ -20,7 +20,7 @@
 import org.eclipse.sapphire.services.ValueImageService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ColorValueImageService extends ValueImageService
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ColorValueLabelService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ColorValueLabelService.java
index 7a7e037..55efcdb 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ColorValueLabelService.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ColorValueLabelService.java
@@ -14,7 +14,7 @@
 import org.eclipse.sapphire.services.ValueLabelService;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ColorValueLabelService extends ValueLabelService
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ElementPropertyCustomGalleryServices.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ElementPropertyCustomGalleryServices.java
index 3238c1c..994d836 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ElementPropertyCustomGalleryServices.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ElementPropertyCustomGalleryServices.java
@@ -24,7 +24,7 @@
 import org.eclipse.sapphire.samples.gallery.IChildElementWithInteger;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ElementPropertyCustomGalleryServices
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ListPropertyCustomGalleryServices.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ListPropertyCustomGalleryServices.java
index cb32ea7..9e90b5a 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ListPropertyCustomGalleryServices.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/ListPropertyCustomGalleryServices.java
@@ -24,7 +24,7 @@
 import org.eclipse.sapphire.samples.gallery.ListPropertyCustomGallery;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class ListPropertyCustomGalleryServices
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/MessageBoxActionHandler.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/MessageBoxActionHandler.java
index c3fb6e5..7e773c8 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/MessageBoxActionHandler.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/MessageBoxActionHandler.java
@@ -19,7 +19,7 @@
 import org.eclipse.sapphire.ui.forms.swt.FormComponentPresentation;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class MessageBoxActionHandler extends SapphireActionHandler
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/OpenSplitFormDialogActionHandler.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/OpenSplitFormDialogActionHandler.java
index a3b56a9..a40fb98 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/OpenSplitFormDialogActionHandler.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/OpenSplitFormDialogActionHandler.java
@@ -20,7 +20,7 @@
 import org.eclipse.sapphire.ui.forms.swt.SapphireDialog;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public class OpenSplitFormDialogActionHandler extends SapphireActionHandler
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/PrefixActionHandlerForList.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/PrefixActionHandlerForList.java
index 20336ed..66d22f6 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/PrefixActionHandlerForList.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/PrefixActionHandlerForList.java
@@ -24,7 +24,7 @@
 import org.eclipse.sapphire.ui.forms.PropertyEditorActionHandler;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class PrefixActionHandlerForList extends PropertyEditorActionHandler
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/PrefixActionHandlerForValue.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/PrefixActionHandlerForValue.java
index 64e0f24..7cc5cbd 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/PrefixActionHandlerForValue.java
+++ b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/PrefixActionHandlerForValue.java
@@ -23,7 +23,7 @@
 import org.eclipse.sapphire.ui.forms.PropertyEditorActionHandler;
 
 /**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
+ * @author <a href="mailto:konstantin@komissarchik.net">Konstantin Komissarchik</a>
  */
 
 public final class PrefixActionHandlerForValue extends PropertyEditorActionHandler
diff --git a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/RectangleToStringConversionService.java b/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/RectangleToStringConversionService.java
index 4789283..22654df 100644
--- a/plugins/org.eclipse.sapphire.samples/src/org/eclipse/sapphire/samples/gallery/internal/RectangleToStringConversionService.java
+++ b/plugins/org.eclipse.sapphire.sa