diff --git a/src/main/java/io/ebean/Ebean.java b/src/main/java/io/ebean/Ebean.java
index cd27c7109..099ff6a95 100644
--- a/src/main/java/io/ebean/Ebean.java
+++ b/src/main/java/io/ebean/Ebean.java
@@ -168,7 +168,7 @@ public final class Ebean {
       } catch (DataSourceConfigurationException e) {
         String msg = "Configuration error creating DataSource for the default EbeanServer." +
           " This typically means a missing application-test.yml or missing ebean-test-config dependency." +
-          " See https://ebean-orm.github.io/docs/trouble-shooting#datasource";
+          " See https://ebean.io/docs/trouble-shooting#datasource";
         throw new DataSourceConfigurationException(msg, e);
 
       } catch (Throwable e) {
diff --git a/src/main/java/io/ebean/config/BeanNotEnhancedException.java b/src/main/java/io/ebean/config/BeanNotEnhancedException.java
index 21e1a5b1a..3f42875db 100644
--- a/src/main/java/io/ebean/config/BeanNotEnhancedException.java
+++ b/src/main/java/io/ebean/config/BeanNotEnhancedException.java
@@ -3,7 +3,7 @@ package io.ebean.config;
 /**
  * Throw when an processing an entity bean that is not bytecode enhanced.
  *
- * Refer: https://ebean-orm.github.io/docs/trouble-shooting#not-enhanced
+ * Refer: https://ebean.io/docs/trouble-shooting#not-enhanced
  */
 public class BeanNotEnhancedException extends IllegalStateException {
 
diff --git a/src/main/java/io/ebean/config/BeanNotRegisteredException.java b/src/main/java/io/ebean/config/BeanNotRegisteredException.java
index 840482d59..dc722e8b4 100644
--- a/src/main/java/io/ebean/config/BeanNotRegisteredException.java
+++ b/src/main/java/io/ebean/config/BeanNotRegisteredException.java
@@ -3,7 +3,7 @@ package io.ebean.config;
 /**
  * Throw when an processing thinks a bean is not registered.
  *
- * Refer: https://ebean-orm.github.io/docs/trouble-shooting#not-registered
+ * Refer: https://ebean.io/docs/trouble-shooting#not-registered
  */
 public class BeanNotRegisteredException extends IllegalStateException {
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 0abaf7a06..8234c4ce4 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -1558,7 +1558,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
     if (!hasEntityBeanInterface(beanClass)) {
       String msg = "Bean " + beanClass + " is not enhanced? If you are running in IDEA or Eclipse check" +
-        " that the enhancement plugin is installed. See https://ebean-orm.github.io/docs/trouble-shooting#not-enhanced";
+        " that the enhancement plugin is installed. See https://ebean.io/docs/trouble-shooting#not-enhanced";
       throw new BeanNotEnhancedException(msg);
     }
 
@@ -1588,7 +1588,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
         // ok to stop and treat just the same as Object.class
         return;
       }
-      throw new BeanNotEnhancedException("Super type " + superclass + " is not enhanced? See https://ebean-orm.github.io/docs/trouble-shooting#not-enhanced");
+      throw new BeanNotEnhancedException("Super type " + superclass + " is not enhanced? See https://ebean.io/docs/trouble-shooting#not-enhanced");
     }
 
     // recursively continue up the inheritance hierarchy
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
index d4f4cd4a5..cfc8e306f 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java
@@ -22,7 +22,7 @@ public class BeanEmbeddedMetaFactory {
     BeanDescriptor<?> targetDesc = owner.getBeanDescriptor(prop.getTargetType());
     if (targetDesc == null) {
       String msg = "Could not find BeanDescriptor for " + prop.getTargetType()
-        + ". Perhaps the EmbeddedId class is not registered? See https://ebean-orm.github.io/docs/trouble-shooting#not-registered";
+        + ". Perhaps the EmbeddedId class is not registered? See https://ebean.io/docs/trouble-shooting#not-registered";
       throw new BeanNotRegisteredException(msg);
     }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index 7ed87e639..06ff2122d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -431,7 +431,7 @@ class AnnotationAssocManys extends AnnotationParser {
 
 
   private String errorMsgMissingBeanTable(Class<?> type, String from) {
-    return "Error with association to [" + type + "] from [" + from + "]. Is " + type + " registered? See https://ebean-orm.github.io/docs/trouble-shooting#not-registered";
+    return "Error with association to [" + type + "] from [" + from + "]. Is " + type + " registered? See https://ebean.io/docs/trouble-shooting#not-registered";
   }
 
   private void readToMany(ManyToMany propAnn, DeployBeanPropertyAssocMany<?> manyProp) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index c17b5e708..1932970fe 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -195,7 +195,7 @@ public class AnnotationAssocOnes extends AnnotationParser {
   }
 
   private String errorMsgMissingBeanTable(Class<?> type, String from) {
-    return "Error with association to [" + type + "] from [" + from + "]. Is " + type + " registered? Does it have the @Entity annotation? See https://ebean-orm.github.io/docs/trouble-shooting#not-registered";
+    return "Error with association to [" + type + "] from [" + from + "]. Is " + type + " registered? Does it have the @Entity annotation? See https://ebean.io/docs/trouble-shooting#not-registered";
   }
 
   private BeanTable beanTable(DeployBeanPropertyAssoc<?> prop) {