diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaActor.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaActor.java
index 665d331c66..f5d9217b43 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaActor.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaActor.java
@@ -9,7 +9,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaActor extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaActorRecord> {
 
-	private static final long serialVersionUID = 1784460568;
+	private static final long serialVersionUID = 667444693;
 
 	/**
 	 * The singleton instance of <code>sakila.actor</code>
@@ -58,6 +58,10 @@ public class SakilaActor extends org.jooq.impl.TableImpl<org.jooq.examples.mysql
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaActor.ACTOR);
 	}
 
+	private SakilaActor(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaActorRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -87,6 +91,13 @@ public class SakilaActor extends org.jooq.impl.TableImpl<org.jooq.examples.mysql
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaActor as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaActor(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaActor(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaActor rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaActor(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaActorInfo.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaActorInfo.java
index 1913492454..11f4f21eb8 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaActorInfo.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaActorInfo.java
@@ -11,7 +11,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaActorInfo extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaActorInfoRecord> {
 
-	private static final long serialVersionUID = 1483707182;
+	private static final long serialVersionUID = -222652239;
 
 	/**
 	 * The singleton instance of <code>sakila.actor_info</code>
@@ -60,11 +60,22 @@ public class SakilaActorInfo extends org.jooq.impl.TableImpl<org.jooq.examples.m
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaActorInfo.ACTOR_INFO);
 	}
 
+	private SakilaActorInfo(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaActorInfoRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaActorInfo as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaActorInfo(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaActorInfo(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaActorInfo rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaActorInfo(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaAddress.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaAddress.java
index b71d3e255c..9f472e116e 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaAddress.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaAddress.java
@@ -9,7 +9,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaAddress extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaAddressRecord> {
 
-	private static final long serialVersionUID = 735372038;
+	private static final long serialVersionUID = 1638107245;
 
 	/**
 	 * The singleton instance of <code>sakila.address</code>
@@ -78,6 +78,10 @@ public class SakilaAddress extends org.jooq.impl.TableImpl<org.jooq.examples.mys
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaAddress.ADDRESS);
 	}
 
+	private SakilaAddress(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaAddressRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -115,6 +119,13 @@ public class SakilaAddress extends org.jooq.impl.TableImpl<org.jooq.examples.mys
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaAddress as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaAddress(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaAddress(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaAddress rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaAddress(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaCategory.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaCategory.java
index 6359b2d667..ea58a87e85 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaCategory.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaCategory.java
@@ -9,7 +9,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaCategory extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaCategoryRecord> {
 
-	private static final long serialVersionUID = 921148275;
+	private static final long serialVersionUID = 708695624;
 
 	/**
 	 * The singleton instance of <code>sakila.category</code>
@@ -53,6 +53,10 @@ public class SakilaCategory extends org.jooq.impl.TableImpl<org.jooq.examples.my
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaCategory.CATEGORY);
 	}
 
+	private SakilaCategory(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaCategoryRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -82,6 +86,13 @@ public class SakilaCategory extends org.jooq.impl.TableImpl<org.jooq.examples.my
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaCategory as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaCategory(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaCategory(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaCategory rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaCategory(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaCity.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaCity.java
index b2831f03d7..a9da7cfb66 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaCity.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaCity.java
@@ -9,7 +9,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaCity extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaCityRecord> {
 
-	private static final long serialVersionUID = -1671387940;
+	private static final long serialVersionUID = -1819343435;
 
 	/**
 	 * The singleton instance of <code>sakila.city</code>
@@ -58,6 +58,10 @@ public class SakilaCity extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaCity.CITY);
 	}
 
+	private SakilaCity(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaCityRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -95,6 +99,13 @@ public class SakilaCity extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaCity as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaCity(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaCity(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaCity rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaCity(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaCountry.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaCountry.java
index f767981b97..7814ab0827 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaCountry.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaCountry.java
@@ -9,7 +9,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaCountry extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaCountryRecord> {
 
-	private static final long serialVersionUID = -202889530;
+	private static final long serialVersionUID = -1584835003;
 
 	/**
 	 * The singleton instance of <code>sakila.country</code>
@@ -53,6 +53,10 @@ public class SakilaCountry extends org.jooq.impl.TableImpl<org.jooq.examples.mys
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaCountry.COUNTRY);
 	}
 
+	private SakilaCountry(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaCountryRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -82,6 +86,13 @@ public class SakilaCountry extends org.jooq.impl.TableImpl<org.jooq.examples.mys
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaCountry as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaCountry(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaCountry(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaCountry rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaCountry(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaCustomer.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaCustomer.java
index 9d77f2325e..6bf651ab63 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaCustomer.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaCustomer.java
@@ -9,7 +9,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaCustomer extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaCustomerRecord> {
 
-	private static final long serialVersionUID = -1450811861;
+	private static final long serialVersionUID = 192324728;
 
 	/**
 	 * The singleton instance of <code>sakila.customer</code>
@@ -83,6 +83,10 @@ public class SakilaCustomer extends org.jooq.impl.TableImpl<org.jooq.examples.my
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaCustomer.CUSTOMER);
 	}
 
+	private SakilaCustomer(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaCustomerRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -120,6 +124,13 @@ public class SakilaCustomer extends org.jooq.impl.TableImpl<org.jooq.examples.my
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaCustomer as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaCustomer(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaCustomer(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaCustomer rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaCustomer(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaCustomerList.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaCustomerList.java
index 6444c2f79c..82a0752d74 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaCustomerList.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaCustomerList.java
@@ -11,7 +11,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaCustomerList extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaCustomerListRecord> {
 
-	private static final long serialVersionUID = 1609692855;
+	private static final long serialVersionUID = 729314860;
 
 	/**
 	 * The singleton instance of <code>sakila.customer_list</code>
@@ -85,11 +85,22 @@ public class SakilaCustomerList extends org.jooq.impl.TableImpl<org.jooq.example
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaCustomerList.CUSTOMER_LIST);
 	}
 
+	private SakilaCustomerList(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaCustomerListRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaCustomerList as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaCustomerList(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaCustomerList(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaCustomerList rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaCustomerList(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaFilm.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaFilm.java
index d9a20116db..494650817b 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaFilm.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaFilm.java
@@ -9,7 +9,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaFilm extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaFilmRecord> {
 
-	private static final long serialVersionUID = 409635857;
+	private static final long serialVersionUID = -1499446024;
 
 	/**
 	 * The singleton instance of <code>sakila.film</code>
@@ -103,6 +103,10 @@ public class SakilaFilm extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaFilm.FILM);
 	}
 
+	private SakilaFilm(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaFilmRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -140,6 +144,13 @@ public class SakilaFilm extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaFilm as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaFilm(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaFilm(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaFilm rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaFilm(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaFilmActor.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaFilmActor.java
index c479870cbc..ed6e5a7d04 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaFilmActor.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaFilmActor.java
@@ -9,7 +9,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaFilmActor extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaFilmActorRecord> {
 
-	private static final long serialVersionUID = 1209369254;
+	private static final long serialVersionUID = -256666347;
 
 	/**
 	 * The singleton instance of <code>sakila.film_actor</code>
@@ -53,6 +53,10 @@ public class SakilaFilmActor extends org.jooq.impl.TableImpl<org.jooq.examples.m
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaFilmActor.FILM_ACTOR);
 	}
 
+	private SakilaFilmActor(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaFilmActorRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -82,6 +86,13 @@ public class SakilaFilmActor extends org.jooq.impl.TableImpl<org.jooq.examples.m
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaFilmActor as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaFilmActor(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaFilmActor(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaFilmActor rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaFilmActor(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaFilmCategory.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaFilmCategory.java
index 46229685f9..874b330915 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaFilmCategory.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaFilmCategory.java
@@ -9,7 +9,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaFilmCategory extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaFilmCategoryRecord> {
 
-	private static final long serialVersionUID = 1017174469;
+	private static final long serialVersionUID = -875644114;
 
 	/**
 	 * The singleton instance of <code>sakila.film_category</code>
@@ -53,6 +53,10 @@ public class SakilaFilmCategory extends org.jooq.impl.TableImpl<org.jooq.example
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaFilmCategory.FILM_CATEGORY);
 	}
 
+	private SakilaFilmCategory(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaFilmCategoryRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -82,6 +86,13 @@ public class SakilaFilmCategory extends org.jooq.impl.TableImpl<org.jooq.example
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaFilmCategory as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaFilmCategory(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaFilmCategory(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaFilmCategory rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaFilmCategory(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaFilmList.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaFilmList.java
index ea023ad6ea..719ec4c394 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaFilmList.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaFilmList.java
@@ -11,7 +11,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaFilmList extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaFilmListRecord> {
 
-	private static final long serialVersionUID = 59318530;
+	private static final long serialVersionUID = -1566503871;
 
 	/**
 	 * The singleton instance of <code>sakila.film_list</code>
@@ -80,11 +80,22 @@ public class SakilaFilmList extends org.jooq.impl.TableImpl<org.jooq.examples.my
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaFilmList.FILM_LIST);
 	}
 
+	private SakilaFilmList(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaFilmListRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaFilmList as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaFilmList(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaFilmList(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaFilmList rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaFilmList(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaFilmText.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaFilmText.java
index fa0b6575ec..c7a85f49f6 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaFilmText.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaFilmText.java
@@ -9,7 +9,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaFilmText extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaFilmTextRecord> {
 
-	private static final long serialVersionUID = 1732400120;
+	private static final long serialVersionUID = 2009937035;
 
 	/**
 	 * The singleton instance of <code>sakila.film_text</code>
@@ -53,6 +53,10 @@ public class SakilaFilmText extends org.jooq.impl.TableImpl<org.jooq.examples.my
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaFilmText.FILM_TEXT);
 	}
 
+	private SakilaFilmText(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaFilmTextRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -74,6 +78,13 @@ public class SakilaFilmText extends org.jooq.impl.TableImpl<org.jooq.examples.my
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaFilmText as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaFilmText(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaFilmText(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaFilmText rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaFilmText(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaInventory.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaInventory.java
index 174256556b..4a16e24a53 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaInventory.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaInventory.java
@@ -9,7 +9,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaInventory extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaInventoryRecord> {
 
-	private static final long serialVersionUID = -1740414205;
+	private static final long serialVersionUID = 248811568;
 
 	/**
 	 * The singleton instance of <code>sakila.inventory</code>
@@ -58,6 +58,10 @@ public class SakilaInventory extends org.jooq.impl.TableImpl<org.jooq.examples.m
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaInventory.INVENTORY);
 	}
 
+	private SakilaInventory(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaInventoryRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -95,6 +99,13 @@ public class SakilaInventory extends org.jooq.impl.TableImpl<org.jooq.examples.m
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaInventory as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaInventory(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaInventory(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaInventory rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaInventory(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaLanguage.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaLanguage.java
index 1f138b94d2..ac3283a5e9 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaLanguage.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaLanguage.java
@@ -9,7 +9,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaLanguage extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaLanguageRecord> {
 
-	private static final long serialVersionUID = 1378175181;
+	private static final long serialVersionUID = 704697170;
 
 	/**
 	 * The singleton instance of <code>sakila.language</code>
@@ -53,6 +53,10 @@ public class SakilaLanguage extends org.jooq.impl.TableImpl<org.jooq.examples.my
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaLanguage.LANGUAGE);
 	}
 
+	private SakilaLanguage(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaLanguageRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -82,6 +86,13 @@ public class SakilaLanguage extends org.jooq.impl.TableImpl<org.jooq.examples.my
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaLanguage as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaLanguage(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaLanguage(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaLanguage rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaLanguage(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaNicerButSlowerFilmList.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaNicerButSlowerFilmList.java
index d86a6f9533..c32e63497b 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaNicerButSlowerFilmList.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaNicerButSlowerFilmList.java
@@ -11,7 +11,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaNicerButSlowerFilmList extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaNicerButSlowerFilmListRecord> {
 
-	private static final long serialVersionUID = 955787358;
+	private static final long serialVersionUID = -1487279259;
 
 	/**
 	 * The singleton instance of <code>sakila.nicer_but_slower_film_list</code>
@@ -80,11 +80,22 @@ public class SakilaNicerButSlowerFilmList extends org.jooq.impl.TableImpl<org.jo
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaNicerButSlowerFilmList.NICER_BUT_SLOWER_FILM_LIST);
 	}
 
+	private SakilaNicerButSlowerFilmList(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaNicerButSlowerFilmListRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaNicerButSlowerFilmList as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaNicerButSlowerFilmList(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaNicerButSlowerFilmList(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaNicerButSlowerFilmList rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaNicerButSlowerFilmList(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaPayment.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaPayment.java
index 7091508578..ad3568dcc6 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaPayment.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaPayment.java
@@ -9,7 +9,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaPayment extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaPaymentRecord> {
 
-	private static final long serialVersionUID = 2005821419;
+	private static final long serialVersionUID = -867946598;
 
 	/**
 	 * The singleton instance of <code>sakila.payment</code>
@@ -73,6 +73,10 @@ public class SakilaPayment extends org.jooq.impl.TableImpl<org.jooq.examples.mys
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaPayment.PAYMENT);
 	}
 
+	private SakilaPayment(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaPaymentRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -110,6 +114,13 @@ public class SakilaPayment extends org.jooq.impl.TableImpl<org.jooq.examples.mys
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaPayment as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaPayment(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaPayment(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaPayment rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaPayment(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaRental.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaRental.java
index 969a774dd8..8cc94a0323 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaRental.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaRental.java
@@ -9,7 +9,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaRental extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaRentalRecord> {
 
-	private static final long serialVersionUID = -864093481;
+	private static final long serialVersionUID = 1890502308;
 
 	/**
 	 * The singleton instance of <code>sakila.rental</code>
@@ -73,6 +73,10 @@ public class SakilaRental extends org.jooq.impl.TableImpl<org.jooq.examples.mysq
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaRental.RENTAL);
 	}
 
+	private SakilaRental(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaRentalRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -110,6 +114,13 @@ public class SakilaRental extends org.jooq.impl.TableImpl<org.jooq.examples.mysq
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaRental as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaRental(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaRental(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaRental rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaRental(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaSalesByFilmCategory.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaSalesByFilmCategory.java
index 240a6ba7ca..8850c1f894 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaSalesByFilmCategory.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaSalesByFilmCategory.java
@@ -11,7 +11,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaSalesByFilmCategory extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaSalesByFilmCategoryRecord> {
 
-	private static final long serialVersionUID = -1929506146;
+	private static final long serialVersionUID = 1564175945;
 
 	/**
 	 * The singleton instance of <code>sakila.sales_by_film_category</code>
@@ -50,11 +50,22 @@ public class SakilaSalesByFilmCategory extends org.jooq.impl.TableImpl<org.jooq.
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaSalesByFilmCategory.SALES_BY_FILM_CATEGORY);
 	}
 
+	private SakilaSalesByFilmCategory(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaSalesByFilmCategoryRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaSalesByFilmCategory as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaSalesByFilmCategory(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaSalesByFilmCategory(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaSalesByFilmCategory rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaSalesByFilmCategory(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaSalesByStore.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaSalesByStore.java
index 7ff97f2002..a89e591226 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaSalesByStore.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaSalesByStore.java
@@ -11,7 +11,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaSalesByStore extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaSalesByStoreRecord> {
 
-	private static final long serialVersionUID = 491049545;
+	private static final long serialVersionUID = -2145066150;
 
 	/**
 	 * The singleton instance of <code>sakila.sales_by_store</code>
@@ -55,11 +55,22 @@ public class SakilaSalesByStore extends org.jooq.impl.TableImpl<org.jooq.example
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaSalesByStore.SALES_BY_STORE);
 	}
 
+	private SakilaSalesByStore(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaSalesByStoreRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaSalesByStore as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaSalesByStore(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaSalesByStore(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaSalesByStore rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaSalesByStore(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaStaff.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaStaff.java
index 1594add1b9..22e288ecf6 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaStaff.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaStaff.java
@@ -9,7 +9,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaStaff extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaStaffRecord> {
 
-	private static final long serialVersionUID = 1638184701;
+	private static final long serialVersionUID = -1928286978;
 
 	/**
 	 * The singleton instance of <code>sakila.staff</code>
@@ -93,6 +93,10 @@ public class SakilaStaff extends org.jooq.impl.TableImpl<org.jooq.examples.mysql
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaStaff.STAFF);
 	}
 
+	private SakilaStaff(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaStaffRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -130,6 +134,13 @@ public class SakilaStaff extends org.jooq.impl.TableImpl<org.jooq.examples.mysql
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaStaff as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaStaff(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaStaff(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaStaff rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaStaff(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaStaffList.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaStaffList.java
index 99ae5b4449..77fb9c7710 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaStaffList.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaStaffList.java
@@ -11,7 +11,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaStaffList extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaStaffListRecord> {
 
-	private static final long serialVersionUID = 1018391092;
+	private static final long serialVersionUID = -1274689321;
 
 	/**
 	 * The singleton instance of <code>sakila.staff_list</code>
@@ -80,11 +80,22 @@ public class SakilaStaffList extends org.jooq.impl.TableImpl<org.jooq.examples.m
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaStaffList.STAFF_LIST);
 	}
 
+	private SakilaStaffList(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaStaffListRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaStaffList as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaStaffList(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaStaffList(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaStaffList rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaStaffList(name, null);
 	}
 }
diff --git a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaStore.java b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaStore.java
index fb2c9459b3..1bac7a2429 100644
--- a/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaStore.java
+++ b/jOOQ-test/examples/org/jooq/examples/mysql/sakila/tables/SakilaStore.java
@@ -9,7 +9,7 @@ package org.jooq.examples.mysql.sakila.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class SakilaStore extends org.jooq.impl.TableImpl<org.jooq.examples.mysql.sakila.tables.records.SakilaStoreRecord> {
 
-	private static final long serialVersionUID = -179221691;
+	private static final long serialVersionUID = 623197570;
 
 	/**
 	 * The singleton instance of <code>sakila.store</code>
@@ -58,6 +58,10 @@ public class SakilaStore extends org.jooq.impl.TableImpl<org.jooq.examples.mysql
 		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, org.jooq.examples.mysql.sakila.tables.SakilaStore.STORE);
 	}
 
+	private SakilaStore(java.lang.String alias, org.jooq.Table<org.jooq.examples.mysql.sakila.tables.records.SakilaStoreRecord> aliased) {
+		super(alias, org.jooq.examples.mysql.sakila.SakilaSakila.SAKILA, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -95,6 +99,13 @@ public class SakilaStore extends org.jooq.impl.TableImpl<org.jooq.examples.mysql
 	 */
 	@Override
 	public org.jooq.examples.mysql.sakila.tables.SakilaStore as(java.lang.String alias) {
-		return new org.jooq.examples.mysql.sakila.tables.SakilaStore(alias);
+		return new org.jooq.examples.mysql.sakila.tables.SakilaStore(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.examples.mysql.sakila.tables.SakilaStore rename(java.lang.String name) {
+		return new org.jooq.examples.mysql.sakila.tables.SakilaStore(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/T_959SpecialCharacters.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/T_959SpecialCharacters.java
index 60b6880cc1..28a3bf894b 100644
--- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/T_959SpecialCharacters.java
+++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/T_959SpecialCharacters.java
@@ -9,19 +9,17 @@ package org.jooq.test.mysql.generatedclasses.enums;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public enum T_959SpecialCharacters implements org.jooq.EnumType {
 
-	a(""),
+	enum_28("enum("),
 
-	b("("),
+	_28("("),
 
-	c(""),
+	_29(")"),
 
-	d(""),
+	_2c(","),
 
-	e(""),
+	_27("'"),
 
-	f(""),
-
-	g("enum");
+	_29enum(")enum");
 
 	private final java.lang.String literal;
 
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/T_959SpecialCharacters.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/T_959SpecialCharacters.java
index 5f6b9eb045..203dea1b74 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/T_959SpecialCharacters.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/T_959SpecialCharacters.java
@@ -9,19 +9,17 @@ package org.jooq.test.mysql2.generatedclasses.enums;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public enum T_959SpecialCharacters implements org.jooq.EnumType {
 
-	a(""),
+	enum_28("enum("),
 
-	b("("),
+	_28("("),
 
-	c(""),
+	_29(")"),
 
-	d(""),
+	_2c(","),
 
-	e(""),
+	_27("'"),
 
-	f_(""),
-
-	g("enum");
+	_29enum(")enum");
 
 	private final java.lang.String literal;
 
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TAuthor.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TAuthor.java
index a21681ecb3..5cf2bb3190 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TAuthor.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TAuthor.java
@@ -11,7 +11,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class TAuthor extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.TAuthorRecord> {
 
-	private static final long serialVersionUID = 2041720033;
+	private static final long serialVersionUID = 1569262167;
 
 	/**
 	 * The singleton instance of <code>test2.t_author</code>
@@ -70,6 +70,10 @@ public class TAuthor extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.genera
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.TAuthor.T_AUTHOR);
 	}
 
+	private TAuthor(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.TAuthorRecord> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -91,6 +95,13 @@ public class TAuthor extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.genera
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.TAuthor as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.TAuthor(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.TAuthor(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.TAuthor rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.TAuthor(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TBook.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TBook.java
index fa41a16552..3215bd1630 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TBook.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TBook.java
@@ -11,7 +11,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class TBook extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.TBookRecord> {
 
-	private static final long serialVersionUID = 378457842;
+	private static final long serialVersionUID = 734829818;
 
 	/**
 	 * The singleton instance of <code>test2.t_book</code>
@@ -90,6 +90,10 @@ public class TBook extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generate
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.TBook.T_BOOK);
 	}
 
+	private TBook(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.TBookRecord> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -119,6 +123,13 @@ public class TBook extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generate
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.TBook as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.TBook(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.TBook(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.TBook rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.TBook(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TBookStore.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TBookStore.java
index 2868f9de92..757d2064a5 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TBookStore.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TBookStore.java
@@ -11,7 +11,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class TBookStore extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.TBookStoreRecord> {
 
-	private static final long serialVersionUID = -1275735549;
+	private static final long serialVersionUID = 1606403557;
 
 	/**
 	 * The singleton instance of <code>test2.t_book_store</code>
@@ -45,6 +45,10 @@ public class TBookStore extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.gen
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.TBookStore.T_BOOK_STORE);
 	}
 
+	private TBookStore(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.TBookStoreRecord> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -66,6 +70,13 @@ public class TBookStore extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.gen
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.TBookStore as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.TBookStore(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.TBookStore(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.TBookStore rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.TBookStore(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TBookToBookStore.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TBookToBookStore.java
index 55deaa612e..119f1e9c26 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TBookToBookStore.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TBookToBookStore.java
@@ -11,7 +11,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class TBookToBookStore extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.TBookToBookStoreRecord> {
 
-	private static final long serialVersionUID = -1357068142;
+	private static final long serialVersionUID = 227954800;
 
 	/**
 	 * The singleton instance of <code>test2.t_book_to_book_store</code>
@@ -55,6 +55,10 @@ public class TBookToBookStore extends org.jooq.impl.TableImpl<org.jooq.test.mysq
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.TBookToBookStore.T_BOOK_TO_BOOK_STORE);
 	}
 
+	private TBookToBookStore(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.TBookToBookStoreRecord> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -84,6 +88,13 @@ public class TBookToBookStore extends org.jooq.impl.TableImpl<org.jooq.test.mysq
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.TBookToBookStore as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.TBookToBookStore(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.TBookToBookStore(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.TBookToBookStore rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.TBookToBookStore(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TBooleans.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TBooleans.java
index 277771c063..dccee3eb21 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TBooleans.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TBooleans.java
@@ -9,7 +9,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class TBooleans extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.TBooleansRecord> {
 
-	private static final long serialVersionUID = 632325308;
+	private static final long serialVersionUID = -1672584804;
 
 	/**
 	 * The singleton instance of <code>test2.t_booleans</code>
@@ -93,6 +93,10 @@ public class TBooleans extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.gene
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.TBooleans.T_BOOLEANS);
 	}
 
+	private TBooleans(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.TBooleansRecord> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -114,6 +118,13 @@ public class TBooleans extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.gene
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.TBooleans as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.TBooleans(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.TBooleans(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.TBooleans rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.TBooleans(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TDates.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TDates.java
index b8564b604b..4eeda13e3e 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TDates.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TDates.java
@@ -9,7 +9,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class TDates extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.TDatesRecord> {
 
-	private static final long serialVersionUID = -1285371796;
+	private static final long serialVersionUID = 1706725382;
 
 	/**
 	 * The singleton instance of <code>test2.t_dates</code>
@@ -78,6 +78,10 @@ public class TDates extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generat
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.TDates.T_DATES);
 	}
 
+	private TDates(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.TDatesRecord> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -99,6 +103,13 @@ public class TDates extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generat
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.TDates as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.TDates(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.TDates(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.TDates rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.TDates(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TExoticTypes.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TExoticTypes.java
index 22cdc3d54a..4ee4400c8d 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TExoticTypes.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TExoticTypes.java
@@ -9,7 +9,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class TExoticTypes extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.TExoticTypesRecord> {
 
-	private static final long serialVersionUID = -1263499011;
+	private static final long serialVersionUID = -1980346263;
 
 	/**
 	 * The singleton instance of <code>test2.t_exotic_types</code>
@@ -48,6 +48,10 @@ public class TExoticTypes extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.g
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.TExoticTypes.T_EXOTIC_TYPES);
 	}
 
+	private TExoticTypes(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.TExoticTypesRecord> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -69,6 +73,13 @@ public class TExoticTypes extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.g
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.TExoticTypes as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.TExoticTypes(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.TExoticTypes(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.TExoticTypes rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.TExoticTypes(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TIdentityPk.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TIdentityPk.java
index 70c59789fd..86514cf3f4 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TIdentityPk.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TIdentityPk.java
@@ -9,7 +9,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class TIdentityPk extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.TIdentityPkRecord> {
 
-	private static final long serialVersionUID = 539974645;
+	private static final long serialVersionUID = 1772409135;
 
 	/**
 	 * The singleton instance of <code>test2.t_identity_pk</code>
@@ -48,6 +48,10 @@ public class TIdentityPk extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.ge
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk.T_IDENTITY_PK);
 	}
 
+	private TIdentityPk(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.TIdentityPkRecord> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -77,6 +81,13 @@ public class TIdentityPk extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.ge
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.TIdentityPk(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TLanguage.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TLanguage.java
index afd637b134..0078093001 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TLanguage.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TLanguage.java
@@ -11,7 +11,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class TLanguage extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.TLanguageRecord> {
 
-	private static final long serialVersionUID = 1302299704;
+	private static final long serialVersionUID = 2088125362;
 
 	/**
 	 * The singleton instance of <code>test2.t_language</code>
@@ -60,6 +60,10 @@ public class TLanguage extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.gene
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.TLanguage.T_LANGUAGE);
 	}
 
+	private TLanguage(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.TLanguageRecord> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -81,6 +85,13 @@ public class TLanguage extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.gene
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.TLanguage as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.TLanguage(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.TLanguage(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.TLanguage rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.TLanguage(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TTriggers.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TTriggers.java
index a962fd9ca7..1dbc4f34f2 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TTriggers.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TTriggers.java
@@ -9,7 +9,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class TTriggers extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.TTriggersRecord> {
 
-	private static final long serialVersionUID = 2122861323;
+	private static final long serialVersionUID = -1317378003;
 
 	/**
 	 * The singleton instance of <code>test2.t_triggers</code>
@@ -53,6 +53,10 @@ public class TTriggers extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.gene
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.TTriggers.T_TRIGGERS);
 	}
 
+	private TTriggers(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.TTriggersRecord> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -82,6 +86,13 @@ public class TTriggers extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.gene
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.TTriggers as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.TTriggers(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.TTriggers(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.TTriggers rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.TTriggers(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TUnsigned.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TUnsigned.java
index 9ff9601a02..d456801b35 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TUnsigned.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/TUnsigned.java
@@ -9,7 +9,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class TUnsigned extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.TUnsignedRecord> {
 
-	private static final long serialVersionUID = -957484559;
+	private static final long serialVersionUID = -557764999;
 
 	/**
 	 * The singleton instance of <code>test2.t_unsigned</code>
@@ -58,11 +58,22 @@ public class TUnsigned extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.gene
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.TUnsigned.T_UNSIGNED);
 	}
 
+	private TUnsigned(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.TUnsignedRecord> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.TUnsigned as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.TUnsigned(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.TUnsigned(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.TUnsigned rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.TUnsigned(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/T_639NumbersTable.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/T_639NumbersTable.java
index 06d6818347..96ab07f258 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/T_639NumbersTable.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/T_639NumbersTable.java
@@ -9,7 +9,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class T_639NumbersTable extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.T_639NumbersTableRecord> {
 
-	private static final long serialVersionUID = -240160998;
+	private static final long serialVersionUID = -1658517898;
 
 	/**
 	 * The singleton instance of <code>test2.t_639_numbers_table</code>
@@ -103,6 +103,10 @@ public class T_639NumbersTable extends org.jooq.impl.TableImpl<org.jooq.test.mys
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE);
 	}
 
+	private T_639NumbersTable(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.T_639NumbersTableRecord> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -124,6 +128,13 @@ public class T_639NumbersTable extends org.jooq.impl.TableImpl<org.jooq.test.mys
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.T_639NumbersTable as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.T_639NumbersTable(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.T_639NumbersTable(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.T_639NumbersTable rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.T_639NumbersTable(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/T_725LobTest.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/T_725LobTest.java
index 72eadeaf19..7ec1785ac3 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/T_725LobTest.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/T_725LobTest.java
@@ -9,7 +9,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class T_725LobTest extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.T_725LobTestRecord> {
 
-	private static final long serialVersionUID = -246961226;
+	private static final long serialVersionUID = -1798466266;
 
 	/**
 	 * The singleton instance of <code>test2.t_725_lob_test</code>
@@ -48,6 +48,10 @@ public class T_725LobTest extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.g
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.T_725LobTest.T_725_LOB_TEST);
 	}
 
+	private T_725LobTest(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.T_725LobTestRecord> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -69,6 +73,13 @@ public class T_725LobTest extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.g
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.T_725LobTest as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.T_725LobTest(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.T_725LobTest(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.T_725LobTest rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.T_725LobTest(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/T_785.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/T_785.java
index 5abe484766..02f3344557 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/T_785.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/T_785.java
@@ -9,7 +9,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class T_785 extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.T_785Record> {
 
-	private static final long serialVersionUID = -982052277;
+	private static final long serialVersionUID = 475975391;
 
 	/**
 	 * The singleton instance of <code>test2.t_785</code>
@@ -53,11 +53,22 @@ public class T_785 extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generate
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.T_785.T_785);
 	}
 
+	private T_785(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.T_785Record> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.T_785 as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.T_785(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.T_785(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.T_785 rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.T_785(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/T_959.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/T_959.java
index 2528346bcd..4707c5fc5d 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/T_959.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/T_959.java
@@ -9,7 +9,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class T_959 extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.T_959Record> {
 
-	private static final long serialVersionUID = 2067307262;
+	private static final long serialVersionUID = 80410088;
 
 	/**
 	 * The singleton instance of <code>test2.t_959</code>
@@ -48,11 +48,22 @@ public class T_959 extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generate
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.T_959.T_959);
 	}
 
+	private T_959(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.T_959Record> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.T_959 as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.T_959(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.T_959(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.T_959 rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.T_959(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/VAuthor.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/VAuthor.java
index 64ee00de00..a82bffe378 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/VAuthor.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/VAuthor.java
@@ -11,7 +11,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class VAuthor extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.VAuthorRecord> {
 
-	private static final long serialVersionUID = 2114224230;
+	private static final long serialVersionUID = -1144373948;
 
 	/**
 	 * The singleton instance of <code>test2.v_author</code>
@@ -70,11 +70,22 @@ public class VAuthor extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.genera
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.VAuthor.V_AUTHOR);
 	}
 
+	private VAuthor(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.VAuthorRecord> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.VAuthor as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.VAuthor(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.VAuthor(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.VAuthor rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.VAuthor(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/VBook.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/VBook.java
index 3b69918fcc..bd27848d0d 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/VBook.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/VBook.java
@@ -11,7 +11,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class VBook extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.VBookRecord> {
 
-	private static final long serialVersionUID = 902848983;
+	private static final long serialVersionUID = -586390405;
 
 	/**
 	 * The singleton instance of <code>test2.v_book</code>
@@ -90,11 +90,22 @@ public class VBook extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generate
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.VBook.V_BOOK);
 	}
 
+	private VBook(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.VBookRecord> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.VBook as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.VBook(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.VBook(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.VBook rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.VBook(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/VLibrary.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/VLibrary.java
index 2350dee533..20dddd8d29 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/VLibrary.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/VLibrary.java
@@ -11,7 +11,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class VLibrary extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.VLibraryRecord> {
 
-	private static final long serialVersionUID = 347424204;
+	private static final long serialVersionUID = -1457868558;
 
 	/**
 	 * The singleton instance of <code>test2.v_library</code>
@@ -50,11 +50,22 @@ public class VLibrary extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.gener
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.VLibrary.V_LIBRARY);
 	}
 
+	private VLibrary(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.VLibraryRecord> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.VLibrary as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.VLibrary(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.VLibrary(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.VLibrary rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.VLibrary(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/XTestCase_2025.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/XTestCase_2025.java
index 8aa9ee6b55..37e8e310ce 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/XTestCase_2025.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/XTestCase_2025.java
@@ -11,7 +11,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class XTestCase_2025 extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.XTestCase_2025Record> {
 
-	private static final long serialVersionUID = 331874567;
+	private static final long serialVersionUID = 206124319;
 
 	/**
 	 * The singleton instance of <code>test2.x_test_case_2025</code>
@@ -50,6 +50,10 @@ public class XTestCase_2025 extends org.jooq.impl.TableImpl<org.jooq.test.mysql2
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.XTestCase_2025.X_TEST_CASE_2025);
 	}
 
+	private XTestCase_2025(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.XTestCase_2025Record> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -63,6 +67,13 @@ public class XTestCase_2025 extends org.jooq.impl.TableImpl<org.jooq.test.mysql2
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.XTestCase_2025 as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.XTestCase_2025(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.XTestCase_2025(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.XTestCase_2025 rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.XTestCase_2025(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/XTestCase_64_69.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/XTestCase_64_69.java
index 95b9434979..cffbf9e907 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/XTestCase_64_69.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/XTestCase_64_69.java
@@ -11,7 +11,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class XTestCase_64_69 extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.XTestCase_64_69Record> {
 
-	private static final long serialVersionUID = -154468704;
+	private static final long serialVersionUID = 1144316096;
 
 	/**
 	 * The singleton instance of <code>test2.x_test_case_64_69</code>
@@ -50,6 +50,10 @@ public class XTestCase_64_69 extends org.jooq.impl.TableImpl<org.jooq.test.mysql
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.XTestCase_64_69.X_TEST_CASE_64_69);
 	}
 
+	private XTestCase_64_69(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.XTestCase_64_69Record> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -79,6 +83,13 @@ public class XTestCase_64_69 extends org.jooq.impl.TableImpl<org.jooq.test.mysql
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.XTestCase_64_69 as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.XTestCase_64_69(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.XTestCase_64_69(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.XTestCase_64_69 rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.XTestCase_64_69(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/XTestCase_71.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/XTestCase_71.java
index add5afaaaf..f9cd4d3698 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/XTestCase_71.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/XTestCase_71.java
@@ -11,7 +11,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class XTestCase_71 extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.XTestCase_71Record> {
 
-	private static final long serialVersionUID = 1863414470;
+	private static final long serialVersionUID = 1976981552;
 
 	/**
 	 * The singleton instance of <code>test2.x_test_case_71</code>
@@ -50,6 +50,10 @@ public class XTestCase_71 extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.g
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.XTestCase_71.X_TEST_CASE_71);
 	}
 
+	private XTestCase_71(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.XTestCase_71Record> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -79,6 +83,13 @@ public class XTestCase_71 extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.g
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.XTestCase_71 as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.XTestCase_71(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.XTestCase_71(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.XTestCase_71 rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.XTestCase_71(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/XTestCase_85.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/XTestCase_85.java
index aeb4adc019..fb64806cf6 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/XTestCase_85.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/XTestCase_85.java
@@ -11,7 +11,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class XTestCase_85 extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.XTestCase_85Record> {
 
-	private static final long serialVersionUID = 817839719;
+	private static final long serialVersionUID = 1564029515;
 
 	/**
 	 * The singleton instance of <code>test2.x_test_case_85</code>
@@ -55,6 +55,10 @@ public class XTestCase_85 extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.g
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.XTestCase_85.X_TEST_CASE_85);
 	}
 
+	private XTestCase_85(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.XTestCase_85Record> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -84,6 +88,13 @@ public class XTestCase_85 extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.g
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.XTestCase_85 as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.XTestCase_85(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.XTestCase_85(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.XTestCase_85 rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.XTestCase_85(name, null);
 	}
 }
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/XUnused.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/XUnused.java
index 4def53e4a0..219ef18fe1 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/XUnused.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/tables/XUnused.java
@@ -11,7 +11,7 @@ package org.jooq.test.mysql2.generatedclasses.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class XUnused extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.generatedclasses.tables.records.XUnusedRecord> {
 
-	private static final long serialVersionUID = -1934331795;
+	private static final long serialVersionUID = -783656535;
 
 	/**
 	 * The singleton instance of <code>test2.x_unused</code>
@@ -110,6 +110,10 @@ public class XUnused extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.genera
 		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, org.jooq.test.mysql2.generatedclasses.tables.XUnused.X_UNUSED);
 	}
 
+	private XUnused(java.lang.String alias, org.jooq.Table<org.jooq.test.mysql2.generatedclasses.tables.records.XUnusedRecord> aliased) {
+		super(alias, org.jooq.test.mysql2.generatedclasses.Test2.TEST2, aliased);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -139,6 +143,13 @@ public class XUnused extends org.jooq.impl.TableImpl<org.jooq.test.mysql2.genera
 	 */
 	@Override
 	public org.jooq.test.mysql2.generatedclasses.tables.XUnused as(java.lang.String alias) {
-		return new org.jooq.test.mysql2.generatedclasses.tables.XUnused(alias);
+		return new org.jooq.test.mysql2.generatedclasses.tables.XUnused(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public org.jooq.test.mysql2.generatedclasses.tables.XUnused rename(java.lang.String name) {
+		return new org.jooq.test.mysql2.generatedclasses.tables.XUnused(name, null);
 	}
 }