Added pruning of entries and database schema

61 files changed, 350 insertions, 219 deletions

diff --git a/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/PersistenceOptions.java b/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/PersistenceOptions.java
index 49b079470..a221ddb7c 100755
--- a/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/PersistenceOptions.java
+++ b/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/PersistenceOptions.java
@@ -64,6 +64,8 @@ public class PersistenceOptions implements ExtensionPoint {
 	 */
 	public static final String AUDITING_PRUNE_OLD_ENTRIES_DAYS = MAPPING_PREFIX
 			+ "auditing.prune.days";
+	public static final String AUDITING_PRUNE_COMMIT_INTERVAL = MAPPING_PREFIX
+			+ "auditing.prune.commit.interval";
 	public static final String AUDITING_DB_SCHEMA = MAPPING_PREFIX + "auditing.database.schema";
 	public static final String AUDITING_ENTITY_PREFIX = NAMING_PREFIX + "auditing.entity.prefix";
 	public static final String AUDITING_ENTITY_POSTFIX = NAMING_PREFIX + "auditing.entity.postfix";
@@ -471,6 +473,8 @@ public class PersistenceOptions implements ExtensionPoint {
 
 		props.setProperty(ENABLE_AUDITING, "false");
 		props.setProperty(AUDITING_PRUNE_OLD_ENTRIES_DAYS, "0");
+		props.setProperty(AUDITING_PRUNE_COMMIT_INTERVAL, "1000");
+
 		props.setProperty(AUDITING_DB_SCHEMA, "");
 		props.setProperty(AUDITING_ENTITY_PREFIX, "");
 		props.setProperty(AUDITING_ENTITY_POSTFIX, "Auditing");
@@ -590,6 +594,18 @@ public class PersistenceOptions implements ExtensionPoint {
 	}
 
 	/**
+	 * @return value of {@link #AUDITING_PRUNE_COMMIT_INTERVAL}
+	 */
+	public long getAuditingPruneCommitInterval() {
+		final String value = properties.getProperty(AUDITING_PRUNE_COMMIT_INTERVAL);
+		try {
+			return Long.parseLong(value);
+		} catch (NumberFormatException e) {
+			return 1000;
+		}
+	}
+
+	/**
 	 * @return value of {@link #AUDITING_ENTITY_POSTFIX}
 	 */
 	public String getAuditingEntityPostfix() {
diff --git a/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/annotations/mapper/EClassAnnotator.java b/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/annotations/mapper/EClassAnnotator.java
index 848853fba..d70f267eb 100755
--- a/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/annotations/mapper/EClassAnnotator.java
+++ b/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/annotations/mapper/EClassAnnotator.java
@@ -212,22 +212,27 @@ public class EClassAnnotator extends AbstractAnnotator implements ExtensionPoint
 			// check if there is a table annotation on a higher level
 			Table table = getTableFromMappedSuperClass(aClass);
 			if (table == null) {
-				table = getFactory().createTable();				
+				table = getFactory().createTable();
 			}
 			table.setEModelElement(eclass);
 			// name is set in next step
 			aClass.setTable(table);
-
-			if (StoreUtil.isAuditEntryEClass(eclass)
-					&& getPersistenceOptions().getAuditingDBSchema() != null
-					&& getPersistenceOptions().getAuditingDBSchema().length() > 0) {
-				table.setSchema(getPersistenceOptions().getAuditingDBSchema());
-			}
 		}
 		if (aClass.getTable() != null && aClass.getTable().getName() == null) {
 			aClass.getTable().setName(getSqlNameStrategy().getTableName(aClass));
 		}
 
+		// set the schema
+		if (aClass.getTable() != null
+				&& aClass.getTable().getSchema() == null
+				&& (eclass.getName().equals("TeneoAuditEntry")
+						|| eclass.getName().equals("TeneoAuditCommitInfo") || StoreUtil
+							.isAuditEntryEClass(eclass))
+				&& getPersistenceOptions().getAuditingDBSchema() != null
+				&& getPersistenceOptions().getAuditingDBSchema().length() > 0) {
+			aClass.getTable().setSchema(getPersistenceOptions().getAuditingDBSchema());
+		}
+
 		if (addDiscriminator(aClass)) {
 			// For hibernate as well as jpox the discriminator column is only
 			// required for single table, the ejb3 spec does not make a clear
diff --git a/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/util/StoreUtil.java b/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/util/StoreUtil.java
index 12ccecd72..3eb299d68 100755
--- a/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/util/StoreUtil.java
+++ b/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/util/StoreUtil.java
@@ -78,7 +78,11 @@ public class StoreUtil {
 	public static final String ANNOTATION_SOURCE = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
 
 	public static boolean isAuditEntryEClass(EClass eClass) {
-		return null != eClass.getEAnnotation(Constants.ANNOTATION_AUDITING_MODELELEMENT);
+		final EAnnotation eAnnotation = eClass.getEAnnotation(Constants.ANNOTATION_SOURCE_AUDITING);
+		if (eAnnotation == null) {
+			return false;
+		}
+		return eAnnotation.getDetails().containsKey(Constants.ANNOTATION_AUDITING_MODELELEMENT);
 	}
 
 	public static void resetSyntheticListInfo(EStructuralFeature eFeature, Object target) {
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/auditing/AuditProcessHandler.java b/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/auditing/AuditProcessHandler.java
index dd501f52d..b79655e33 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/auditing/AuditProcessHandler.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/auditing/AuditProcessHandler.java
@@ -39,6 +39,8 @@ import org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.Teneoauditin
 import org.eclipse.emf.teneo.util.StoreUtil;
 import org.hibernate.FlushMode;
 import org.hibernate.Query;
+import org.hibernate.ScrollMode;
+import org.hibernate.ScrollableResults;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.action.spi.AfterTransactionCompletionProcess;
@@ -65,6 +67,12 @@ public class AuditProcessHandler implements AfterTransactionCompletionProcess,
 
 	public static final long DEFAULT_END_TIMESTAMP = -1;
 
+	private static ThreadLocal<String> currentUserName = new ThreadLocal<String>();
+
+	public static void setCurrentUserName(String user) {
+		currentUserName.set(user);
+	}
+
 	private static final long serialVersionUID = 1L;
 	private HbDataStore dataStore;
 
@@ -72,7 +80,8 @@ public class AuditProcessHandler implements AfterTransactionCompletionProcess,
 
 	private int pruneCounter = 0;
 	private long pruneTime = 0;
-	private List<EClass> auditEClasses = null;
+	private long pruneInterval = 1000;
+	private List<String> auditEntityNames = null;
 
 	private boolean isAudited(Object entity) {
 		if (!(entity instanceof EObject)) {
@@ -157,7 +166,7 @@ public class AuditProcessHandler implements AfterTransactionCompletionProcess,
 		if (!FlushMode.isManualFlushMode(session.getFlushMode())) {
 			session.flush();
 			final List<AuditWork> auditWorks = getRemoveQueue((Session) session, false);
-			if (auditWorks == null) {
+			if (auditWorks == null || auditWorks.isEmpty()) {
 				return;
 			}
 			doAuditWorkInSession((Session) session, auditWorks);
@@ -170,7 +179,9 @@ public class AuditProcessHandler implements AfterTransactionCompletionProcess,
 			return;
 		}
 		final List<AuditWork> auditWorks = getRemoveQueue((Session) session, true);
-		if (auditWorks == null) {
+		if (auditWorks == null || auditWorks.isEmpty()) {
+			// remove any old entries
+			pruneEntries((SessionImplementor) session);
 			return;
 		}
 		// see: http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4178431
@@ -193,6 +204,9 @@ public class AuditProcessHandler implements AfterTransactionCompletionProcess,
 				}
 			}
 		}
+
+		// remove any old entries
+		pruneEntries((SessionImplementor) session);
 	}
 
 	private void doAuditWorkInSession(Session session, List<AuditWork> auditWorks) {
@@ -202,6 +216,9 @@ public class AuditProcessHandler implements AfterTransactionCompletionProcess,
 
 		final TeneoAuditCommitInfo commitInfo = TeneoauditingFactory.eINSTANCE
 				.createTeneoAuditCommitInfo();
+		if (currentUserName.get() != null) {
+			commitInfo.setUser(currentUserName.get());
+		}
 		session.save(commitInfo);
 		evictObjects.add(commitInfo);
 
@@ -288,8 +305,7 @@ public class AuditProcessHandler implements AfterTransactionCompletionProcess,
 		// clear the work queue
 		getRemoveQueue(session, false);
 
-		// remove any old entries
-		pruneEntries((SessionImplementor) session);
+		pruneCounter++;
 	}
 
 	// is called/used in case of emap entries which are themselves
@@ -343,23 +359,25 @@ public class AuditProcessHandler implements AfterTransactionCompletionProcess,
 	public void setDataStore(HbDataStore dataStore) {
 		this.dataStore = dataStore;
 		pruneTime = 1000 * 3600 * 24 * dataStore.getPersistenceOptions().getAuditingPruneDays();
+		pruneInterval = dataStore.getPersistenceOptions().getAuditingPruneCommitInterval();
 	}
 
 	private synchronized void pruneEntries(SessionImplementor session) {
 		if (pruneTime == 0) {
 			return;
 		}
-		pruneCounter++;
-		if ((pruneCounter % 100) != 0) {
+		if (pruneCounter > pruneInterval) {
 			return;
 		}
+		pruneCounter = 0;
 
-		if (auditEClasses == null) {
-			auditEClasses = new ArrayList<EClass>();
+		if (auditEntityNames == null) {
+			auditEntityNames = new ArrayList<String>();
 			for (EPackage ePackage : dataStore.getEPackages()) {
 				for (EClassifier eClassifier : ePackage.getEClassifiers()) {
 					if (eClassifier instanceof EClass && StoreUtil.isAuditEntryEClass((EClass) eClassifier)) {
-						auditEClasses.add((EClass) eClassifier);
+						auditEntityNames.add(dataStore.getEntityNameStrategy().toEntityName(
+								(EClass) eClassifier));
 					}
 				}
 			}
@@ -371,14 +389,15 @@ public class AuditProcessHandler implements AfterTransactionCompletionProcess,
 			tmpSession = session.getFactory().openSession();
 			tmpSession.beginTransaction();
 			final long currentPruneTime = System.currentTimeMillis() - pruneTime;
-			for (EClass auditEClass : auditEClasses) {
-				final Query qry = tmpSession.createQuery("select e from "
-						+ dataStore.getEntityNameStrategy().toEntityName(auditEClass)
+			for (String auditEntityName : auditEntityNames) {
+				final Query qry = tmpSession.createQuery("select e from " + auditEntityName
 						+ " e where e.teneo_start < :pruneTime");
 				qry.setParameter("pruneTime", currentPruneTime);
-				for (Object o : qry.list()) {
-					tmpSession.delete(o);
+				ScrollableResults results = qry.scroll(ScrollMode.FORWARD_ONLY);
+				while (results.next()) {
+					tmpSession.delete(results.get()[0]);
 				}
+				results.close();
 			}
 			tmpSession.getTransaction().commit();
 			err = false;
@@ -403,6 +422,10 @@ public class AuditProcessHandler implements AfterTransactionCompletionProcess,
 		pruneTime = thePruneTime;
 	}
 
+	public long getPruneTime() {
+		return pruneTime;
+	}
+
 	private class AuditWork {
 		private Object entity;
 		private TeneoAuditKind auditKind;
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleArrayAuditingAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleArrayAuditingAction_hsqldb_e_o_hibernate.hbm.xml
index dabfd7de0..6253708e1 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleArrayAuditingAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleArrayAuditingAction_hsqldb_e_o_hibernate.hbm.xml
@@ -79,7 +79,7 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
 		</property>
-		<array name="intArray" table="`SIMPLELISTAUDITING_INTARRAY`" cascade="all">
+		<array name="intArray" table="`SIMPLELISTAUDITING_INTARRAYAUDITING`" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_INTARRAY_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleArrayAuditingAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleArrayAuditingAction_hsqldb_h_o_hibernate.hbm.xml
index 069bb8009..454829d48 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleArrayAuditingAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleArrayAuditingAction_hsqldb_h_o_hibernate.hbm.xml
@@ -88,7 +88,7 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
 		</property>
-		<array name="intArray" table="`SIMPLELISTAUDITING_INTARRAY`" cascade="all">
+		<array name="intArray" table="`SIMPLELISTAUDITING_INTARRAYAUDITING`" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_INTARRAY_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleLibraryAuditingAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleLibraryAuditingAction_hsqldb_e_o_hibernate.hbm.xml
index 686604526..9d5810e05 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleLibraryAuditingAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleLibraryAuditingAction_hsqldb_e_o_hibernate.hbm.xml
@@ -201,14 +201,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -258,7 +258,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleLibraryAuditingAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleLibraryAuditingAction_hsqldb_h_o_hibernate.hbm.xml
index e080b6b0a..4671738e2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleLibraryAuditingAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleLibraryAuditingAction_hsqldb_h_o_hibernate.hbm.xml
@@ -219,14 +219,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -279,7 +279,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleTypeAuditingAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleTypeAuditingAction_hsqldb_e_o_hibernate.hbm.xml
index b59f5f298..720d464e2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleTypeAuditingAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleTypeAuditingAction_hsqldb_e_o_hibernate.hbm.xml
@@ -286,56 +286,56 @@
 		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`CODE`"/>
 		</property>
-		<list name="boo" table="`SIMPLELISTAUDITING_BOO`" lazy="true" cascade="all">
+		<list name="boo" table="`SIMPLELISTAUDITING_BOOAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_BOO_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_BOO_IDX`"/>
 			<element type="boolean"/>
 		</list>
-		<list name="byt" table="`SIMPLELISTAUDITING_BYT`" lazy="true" cascade="all">
+		<list name="byt" table="`SIMPLELISTAUDITING_BYTAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_BYT_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_BYT_IDX`"/>
 			<element type="java.lang.Byte"/>
 		</list>
-		<list name="doubl" table="`SIMPLELISTAUDITING_DOUBL`" lazy="true" cascade="all">
+		<list name="doubl" table="`SIMPLELISTAUDITING_DOUBLAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_DOUBL_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_DOUBL_IDX`"/>
 			<element type="java.lang.Double"/>
 		</list>
-		<list name="floa" table="`SIMPLELISTAUDITING_FLOA`" lazy="true" cascade="all">
+		<list name="floa" table="`SIMPLELISTAUDITING_FLOAAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_FLOA_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_FLOA_IDX`"/>
 			<element type="java.lang.Float"/>
 		</list>
-		<list name="inte" table="`SIMPLELISTAUDITING_INTE`" lazy="true" cascade="all">
+		<list name="inte" table="`SIMPLELISTAUDITING_INTEAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_INTE_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_INTE_IDX`"/>
 			<element type="java.lang.Integer"/>
 		</list>
-		<list name="long" table="`SIMPLELISTAUDITING_LONG`" lazy="true" cascade="all">
+		<list name="long" table="`SIMPLELISTAUDITING_LONGAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_LONG_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_LONG_IDX`"/>
 			<element type="java.lang.Long"/>
 		</list>
-		<list name="shor" table="`SIMPLELISTAUDITING_SHOR`" lazy="true" cascade="all">
+		<list name="shor" table="`SIMPLELISTAUDITING_SHORAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_SHOR_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_SHOR_IDX`"/>
 			<element type="short"/>
 		</list>
-		<list name="enu" table="`SIMPLELISTAUDITING_ENU`" lazy="true" cascade="all">
+		<list name="enu" table="`SIMPLELISTAUDITING_ENUAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_ENU_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -348,35 +348,35 @@
 				</type>
 			</element>
 		</list>
-		<list name="dat" table="`SIMPLELISTAUDITING_DAT`" lazy="true" cascade="all">
+		<list name="dat" table="`SIMPLELISTAUDITING_DATAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_DAT_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_DAT_IDX`"/>
 			<element type="timestamp"/>
 		</list>
-		<list name="limitedstring" table="`SIMPLELISTAUDITING_LIMITEDSTRING`" lazy="true" cascade="all">
+		<list name="limitedstring" table="`SIMPLELISTAUDITING_LIMITEDSTRINGAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_LIMITEDSTRING_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_LIMITEDSTRING_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="stri" table="`SIMPLELISTAUDITING_STRI`" lazy="true" cascade="all">
+		<list name="stri" table="`SIMPLELISTAUDITING_STRIAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_STRI_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_STRI_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<array name="intArray" table="`SIMPLELISTAUDITING_INTARRAY`" cascade="all">
+		<array name="intArray" table="`SIMPLELISTAUDITING_INTARRAYAUDITING`" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_INTARRAY_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_INTARRAY_IDX`"/>
 			<element type="int"/>
 		</array>
-		<array name="doubleArray" table="`SIMPLELISTAUDITING_DOUBLEARRAY`" cascade="all">
+		<array name="doubleArray" table="`SIMPLELISTAUDITING_DOUBLEARRAYAUDITING`" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_DOUBLEARRAY_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -386,7 +386,7 @@
 		<property name="stringArray" lazy="false" insert="true" update="true" not-null="false" unique="false" type="simpletypes.StringArray">
 			<column not-null="false" unique="false" name="`STRINGARRAY`"/>
 		</property>
-		<array name="byteArray" table="`SIMPLELISTAUDITING_BYTEARRAY`" cascade="all">
+		<array name="byteArray" table="`SIMPLELISTAUDITING_BYTEARRAYAUDITING`" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_BYTEARRAY_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleTypeAuditingAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleTypeAuditingAction_hsqldb_h_o_hibernate.hbm.xml
index c9f533814..84b5cff54 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleTypeAuditingAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.auditing/SimpleTypeAuditingAction_hsqldb_h_o_hibernate.hbm.xml
@@ -301,56 +301,56 @@
 		<property name="code" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`CODE`"/>
 		</property>
-		<list name="boo" table="`SIMPLELISTAUDITING_BOO`" lazy="true" cascade="all">
+		<list name="boo" table="`SIMPLELISTAUDITING_BOOAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_BOO_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_BOO_IDX`"/>
 			<element type="boolean"/>
 		</list>
-		<list name="byt" table="`SIMPLELISTAUDITING_BYT`" lazy="true" cascade="all">
+		<list name="byt" table="`SIMPLELISTAUDITING_BYTAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_BYT_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_BYT_IDX`"/>
 			<element type="java.lang.Byte"/>
 		</list>
-		<list name="doubl" table="`SIMPLELISTAUDITING_DOUBL`" lazy="true" cascade="all">
+		<list name="doubl" table="`SIMPLELISTAUDITING_DOUBLAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_DOUBL_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_DOUBL_IDX`"/>
 			<element type="java.lang.Double"/>
 		</list>
-		<list name="floa" table="`SIMPLELISTAUDITING_FLOA`" lazy="true" cascade="all">
+		<list name="floa" table="`SIMPLELISTAUDITING_FLOAAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_FLOA_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_FLOA_IDX`"/>
 			<element type="java.lang.Float"/>
 		</list>
-		<list name="inte" table="`SIMPLELISTAUDITING_INTE`" lazy="true" cascade="all">
+		<list name="inte" table="`SIMPLELISTAUDITING_INTEAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_INTE_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_INTE_IDX`"/>
 			<element type="java.lang.Integer"/>
 		</list>
-		<list name="long" table="`SIMPLELISTAUDITING_LONG`" lazy="true" cascade="all">
+		<list name="long" table="`SIMPLELISTAUDITING_LONGAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_LONG_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_LONG_IDX`"/>
 			<element type="java.lang.Long"/>
 		</list>
-		<list name="shor" table="`SIMPLELISTAUDITING_SHOR`" lazy="true" cascade="all">
+		<list name="shor" table="`SIMPLELISTAUDITING_SHORAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_SHOR_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_SHOR_IDX`"/>
 			<element type="short"/>
 		</list>
-		<list name="enu" table="`SIMPLELISTAUDITING_ENU`" lazy="true" cascade="all">
+		<list name="enu" table="`SIMPLELISTAUDITING_ENUAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_ENU_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -363,35 +363,35 @@
 				</type>
 			</element>
 		</list>
-		<list name="dat" table="`SIMPLELISTAUDITING_DAT`" lazy="true" cascade="all">
+		<list name="dat" table="`SIMPLELISTAUDITING_DATAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_DAT_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_DAT_IDX`"/>
 			<element type="timestamp"/>
 		</list>
-		<list name="limitedstring" table="`SIMPLELISTAUDITING_LIMITEDSTRING`" lazy="true" cascade="all">
+		<list name="limitedstring" table="`SIMPLELISTAUDITING_LIMITEDSTRINGAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_LIMITEDSTRING_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_LIMITEDSTRING_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="stri" table="`SIMPLELISTAUDITING_STRI`" lazy="true" cascade="all">
+		<list name="stri" table="`SIMPLELISTAUDITING_STRIAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_STRI_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_STRI_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<array name="intArray" table="`SIMPLELISTAUDITING_INTARRAY`" cascade="all">
+		<array name="intArray" table="`SIMPLELISTAUDITING_INTARRAYAUDITING`" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_INTARRAY_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIMPLELISTAUDITING_INTARRAY_IDX`"/>
 			<element type="int"/>
 		</array>
-		<array name="doubleArray" table="`SIMPLELISTAUDITING_DOUBLEARRAY`" cascade="all">
+		<array name="doubleArray" table="`SIMPLELISTAUDITING_DOUBLEARRAYAUDITING`" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_DOUBLEARRAY_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -401,7 +401,7 @@
 		<property name="stringArray" lazy="false" insert="true" update="true" not-null="false" unique="false" type="simpletypes.StringArray">
 			<column not-null="false" unique="false" name="`STRINGARRAY`"/>
 		</property>
-		<array name="byteArray" table="`SIMPLELISTAUDITING_BYTEARRAY`" cascade="all">
+		<array name="byteArray" table="`SIMPLELISTAUDITING_BYTEARRAYAUDITING`" cascade="all">
 			<key update="true">
 				<column name="`SIMPLELISTAUDITING_BYTEARRAY_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/ElementCollectionAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/ElementCollectionAction_hsqldb_e_o_hibernate.hbm.xml
index 3eef30b22..37df538c4 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/ElementCollectionAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/ElementCollectionAction_hsqldb_e_o_hibernate.hbm.xml
@@ -76,7 +76,7 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
 		</property>
-		<list name="names" table="`ITEMAUDITING_NAMES`" lazy="true" cascade="all">
+		<list name="names" table="`ITEMAUDITING_NAMESAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`ITEMAUDITING_NAMES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/ElementCollectionAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/ElementCollectionAction_hsqldb_h_o_hibernate.hbm.xml
index ec31e3b54..1a8847b04 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/ElementCollectionAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/ElementCollectionAction_hsqldb_h_o_hibernate.hbm.xml
@@ -85,7 +85,7 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
 		</property>
-		<list name="names" table="`ITEMAUDITING_NAMES`" lazy="true" cascade="all">
+		<list name="names" table="`ITEMAUDITING_NAMESAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`ITEMAUDITING_NAMES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml
index 1fc9aa7c3..da7b6ae22 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml
@@ -173,7 +173,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="address" table="`EMPLOYEEAUDITING_ADDRESS`" lazy="true" cascade="all">
+		<list name="address" table="`EMPLOYEEAUDITING_ADDRESSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`EMPLOYEEAUDITING_ADDRESS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -229,7 +229,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="address" table="`PERSONAUDITING_ADDRESS`" lazy="true" cascade="all">
+		<list name="address" table="`PERSONAUDITING_ADDRESSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`PERSONAUDITING_ADDRESS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -282,7 +282,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="address" table="`STUDENTAUDITING_ADDRESS`" lazy="true" cascade="all">
+		<list name="address" table="`STUDENTAUDITING_ADDRESSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`STUDENTAUDITING_ADDRESS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml
index a29a37b08..e066adece 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml
@@ -191,7 +191,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="address" table="`EMPLOYEEAUDITING_ADDRESS`" lazy="true" cascade="all">
+		<list name="address" table="`EMPLOYEEAUDITING_ADDRESSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`EMPLOYEEAUDITING_ADDRESS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -250,7 +250,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="address" table="`PERSONAUDITING_ADDRESS`" lazy="true" cascade="all">
+		<list name="address" table="`PERSONAUDITING_ADDRESSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`PERSONAUDITING_ADDRESS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -306,7 +306,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="address" table="`STUDENTAUDITING_ADDRESS`" lazy="true" cascade="all">
+		<list name="address" table="`STUDENTAUDITING_ADDRESSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`STUDENTAUDITING_ADDRESS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrderColumnAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrderColumnAction_hsqldb_e_o_hibernate.hbm.xml
index 771b1f6d0..771dbc0af 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrderColumnAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrderColumnAction_hsqldb_e_o_hibernate.hbm.xml
@@ -150,7 +150,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="item" table="`ITEMLISTAUDITING_ITEM`" lazy="true" cascade="all">
+		<list name="item" table="`ITEMLISTAUDITING_ITEMAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`ITEMLISTAUDITING_ITEM_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrderColumnAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrderColumnAction_hsqldb_h_o_hibernate.hbm.xml
index 54c916629..a4d9e560f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrderColumnAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrderColumnAction_hsqldb_h_o_hibernate.hbm.xml
@@ -165,7 +165,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="item" table="`ITEMLISTAUDITING_ITEM`" lazy="true" cascade="all">
+		<list name="item" table="`ITEMLISTAUDITING_ITEMAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`ITEMLISTAUDITING_ITEM_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrphanRemovalAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrphanRemovalAction_hsqldb_e_o_hibernate.hbm.xml
index 9ff87cd2b..4c5d07214 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrphanRemovalAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrphanRemovalAction_hsqldb_e_o_hibernate.hbm.xml
@@ -111,7 +111,7 @@
 		<property name="employeeInfo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`EMPLOYEEINFO`"/>
 		</property>
-		<list name="addresses" table="`EMPLOYEEAUDITING_ADDRESSES`" lazy="true" cascade="all">
+		<list name="addresses" table="`EMPLOYEEAUDITING_ADDRESSESAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`EMPLOYEEAUDITING_ADDRESSES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrphanRemovalAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrphanRemovalAction_hsqldb_h_o_hibernate.hbm.xml
index f3eeef38f..408098c2d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrphanRemovalAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrphanRemovalAction_hsqldb_h_o_hibernate.hbm.xml
@@ -126,7 +126,7 @@
 		<property name="employeeInfo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`EMPLOYEEINFO`"/>
 		</property>
-		<list name="addresses" table="`EMPLOYEEAUDITING_ADDRESSES`" lazy="true" cascade="all">
+		<list name="addresses" table="`EMPLOYEEAUDITING_ADDRESSESAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`EMPLOYEEAUDITING_ADDRESSES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/AccountingTest$1_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/AccountingTest$1_hsqldb_h_o_hibernate.hbm.xml
index 83af8a532..846bdc052 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/AccountingTest$1_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/AccountingTest$1_hsqldb_h_o_hibernate.hbm.xml
@@ -354,7 +354,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="account" table="`ACCOUNTGROUPAUDITING_ACCOUNT`" lazy="true" cascade="all">
+		<list name="account" table="`ACCOUNTGROUPAUDITING_ACCOUNTAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`ACCOUNTGROUPAUDITING_ACCOUNT_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -407,14 +407,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="accountGroup" table="`ACCOUNTINGAUDITING_ACCOUNTGROUP`" lazy="true" cascade="all">
+		<list name="accountGroup" table="`ACCOUNTINGAUDITING_ACCOUNTGROUPAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`ACCOUNTINGAUDITING_ACCOUNTGROUP_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`ACCOUNTINGAUDITING_ACCOUNTGROUP_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="vat" table="`ACCOUNTINGAUDITING_VAT`" lazy="true" cascade="all">
+		<list name="vat" table="`ACCOUNTINGAUDITING_VATAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`ACCOUNTINGAUDITING_VAT_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -427,7 +427,7 @@
 		<property name="report" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`REPORT`"/>
 		</property>
-		<list name="journalGroup" table="`ACCOUNTINGAUDITING_JOURNALGROUP`" lazy="true" cascade="all">
+		<list name="journalGroup" table="`ACCOUNTINGAUDITING_JOURNALGROUPAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`ACCOUNTINGAUDITING_JOURNALGROUP_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -480,7 +480,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="report" table="`BALANCEACCOUNTAUDITING_REPORT`" lazy="true" cascade="all">
+		<list name="report" table="`BALANCEACCOUNTAUDITING_REPORTAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`BALANCEACCOUNTAUDITING_REPORT_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -533,14 +533,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="journalGroups" table="`JOURNALGROUPAUDITING_JOURNALGROUPS`" lazy="true" cascade="all">
+		<list name="journalGroups" table="`JOURNALGROUPAUDITING_JOURNALGROUPSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`JOURNALGROUPAUDITING_JOURNALGROUPS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`JOURNALGROUPAUDITING_JOURNALGROUPS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="journalStatements" table="`JOURNALGROUPAUDITING_JOURNALSTATEMENTS`" lazy="true" cascade="all">
+		<list name="journalStatements" table="`JOURNALGROUPAUDITING_JOURNALSTATEMENTSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`JOURNALGROUPAUDITING_JOURNALSTATEMENTS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -752,14 +752,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="reportGroup" table="`REPORTGROUPAUDITING_REPORTGROUP`" lazy="true" cascade="all">
+		<list name="reportGroup" table="`REPORTGROUPAUDITING_REPORTGROUPAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`REPORTGROUPAUDITING_REPORTGROUP_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`REPORTGROUPAUDITING_REPORTGROUP_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="account" table="`REPORTGROUPAUDITING_ACCOUNT`" lazy="true" cascade="all">
+		<list name="account" table="`REPORTGROUPAUDITING_ACCOUNTAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`REPORTGROUPAUDITING_ACCOUNT_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/Bz292973$1_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/Bz292973$1_hsqldb_h_o_hibernate.hbm.xml
index fef1156d6..ab22fc329 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/Bz292973$1_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/Bz292973$1_hsqldb_h_o_hibernate.hbm.xml
@@ -228,14 +228,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`" length="50"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -289,7 +289,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`" length="50"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CapaTest$1_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CapaTest$1_hsqldb_h_o_hibernate.hbm.xml
index 1e5c82f4f..eb3186706 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CapaTest$1_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CapaTest$1_hsqldb_h_o_hibernate.hbm.xml
@@ -352,7 +352,7 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
 		</property>
-		<list name="machines" table="`MACHINELISTAUDITING_MACHINES`" lazy="true" cascade="all">
+		<list name="machines" table="`MACHINELISTAUDITING_MACHINESAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`MACHINELISTAUDITING_MACHINES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -576,7 +576,7 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
 		</property>
-		<list name="days" table="`WORKWEEKAUDITING_DAYS`" lazy="true" cascade="all">
+		<list name="days" table="`WORKWEEKAUDITING_DAYSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WORKWEEKAUDITING_DAYS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CatalogTest$1_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CatalogTest$1_hsqldb_h_o_hibernate.hbm.xml
index d051d1bcc..338521649 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CatalogTest$1_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/CatalogTest$1_hsqldb_h_o_hibernate.hbm.xml
@@ -191,14 +191,14 @@
 		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`DESCRIPTION`"/>
 		</property>
-		<list name="subCatalog" table="`CATALOGTYPEAUDITING_SUBCATALOG`" lazy="true" cascade="all">
+		<list name="subCatalog" table="`CATALOGTYPEAUDITING_SUBCATALOGAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`CATALOGTYPEAUDITING_SUBCATALOG_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`CATALOGTYPEAUDITING_SUBCATALOG_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="product" table="`CATALOGTYPEAUDITING_PRODUCT`" lazy="true" cascade="all">
+		<list name="product" table="`CATALOGTYPEAUDITING_PRODUCTAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`CATALOGTYPEAUDITING_PRODUCT_TENEO_AUDIT_ID`" unique="false">
 					<comment>My product</comment>
@@ -310,7 +310,7 @@
 				<comment>My descrip</comment>
 			</column>
 		</property>
-		<list name="remark" table="`PRODUCTTYPEAUDITING_REMARK`" lazy="true" cascade="all">
+		<list name="remark" table="`PRODUCTTYPEAUDITING_REMARKAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`PRODUCTTYPEAUDITING_REMARK_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicAction_hsqldb_h_o_hibernate.hbm.xml
index 7a7e72fa5..32d9fae12 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicAction_hsqldb_h_o_hibernate.hbm.xml
@@ -107,7 +107,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="group" table="`PERSONAUDITING_GROUP`" lazy="true" cascade="all,delete-orphan">
+		<list name="group" table="`PERSONAUDITING_GROUPAUDITING`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`PERSONAUDITING_GROUP_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicNoDbSchemaUpdateAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicNoDbSchemaUpdateAction_hsqldb_h_o_hibernate.hbm.xml
index a6b780623..3b82d94bc 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicNoDbSchemaUpdateAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/DynamicNoDbSchemaUpdateAction_hsqldb_h_o_hibernate.hbm.xml
@@ -195,7 +195,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="group" table="`PERSONAUDITING_GROUP`" lazy="true" cascade="all,delete-orphan">
+		<list name="group" table="`PERSONAUDITING_GROUPAUDITING`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`PERSONAUDITING_GROUP_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -264,7 +264,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="group" table="`EMPLOYEEAUDITING_GROUP`" lazy="true" cascade="all,delete-orphan">
+		<list name="group" table="`EMPLOYEEAUDITING_GROUPAUDITING`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`EMPLOYEEAUDITING_GROUP_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -339,7 +339,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="group" table="`SPECIALEMPLOYEEAUDITING_GROUP`" lazy="true" cascade="all,delete-orphan">
+		<list name="group" table="`SPECIALEMPLOYEEAUDITING_GROUPAUDITING`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`SPECIALEMPLOYEEAUDITING_GROUP_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -352,7 +352,7 @@
 		<property name="department" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`DEPARTMENT`"/>
 		</property>
-		<list name="offices" table="`SPECIALEMPLOYEEAUDITING_OFFICES`" lazy="true" cascade="all">
+		<list name="offices" table="`SPECIALEMPLOYEEAUDITING_OFFICESAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SPECIALEMPLOYEEAUDITING_OFFICES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -421,7 +421,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="manager" table="`DEPARTMENTAUDITING_MANAGER`" lazy="true" cascade="all">
+		<list name="manager" table="`DEPARTMENTAUDITING_MANAGERAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`DEPARTMENTAUDITING_MANAGER_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EmployeeAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EmployeeAction_hsqldb_h_o_hibernate.hbm.xml
index 9e0916c0d..e07919f3e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EmployeeAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/EmployeeAction_hsqldb_h_o_hibernate.hbm.xml
@@ -121,7 +121,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="employees" table="`DEPARTMENTAUDITING_EMPLOYEES`" lazy="true" cascade="all">
+		<list name="employees" table="`DEPARTMENTAUDITING_EMPLOYEESAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`DEPARTMENTAUDITING_EMPLOYEES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ExtendedPO2Test$1_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ExtendedPO2Test$1_hsqldb_h_o_hibernate.hbm.xml
index 977c3b785..72fa307ae 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ExtendedPO2Test$1_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/ExtendedPO2Test$1_hsqldb_h_o_hibernate.hbm.xml
@@ -390,7 +390,7 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
 		</property>
-		<list name="items" table="`PURCHASEORDERAUDITING_ITEMS`" lazy="true" cascade="all">
+		<list name="items" table="`PURCHASEORDERAUDITING_ITEMSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`PURCHASEORDERAUDITING_ITEMS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -518,14 +518,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="customers" table="`SUPPLIERAUDITING_CUSTOMERS`" lazy="true" cascade="all">
+		<list name="customers" table="`SUPPLIERAUDITING_CUSTOMERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SUPPLIERAUDITING_CUSTOMERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SUPPLIERAUDITING_CUSTOMERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="orders" table="`SUPPLIERAUDITING_ORDERS`" lazy="true" cascade="all">
+		<list name="orders" table="`SUPPLIERAUDITING_ORDERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SUPPLIERAUDITING_ORDERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -578,7 +578,7 @@
 		<property name="customerID" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`CUSTOMERID`"/>
 		</property>
-		<list name="orders" table="`CUSTOMERAUDITING_ORDERS`" lazy="true" cascade="all">
+		<list name="orders" table="`CUSTOMERAUDITING_ORDERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`CUSTOMERAUDITING_ORDERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -637,7 +637,7 @@
 		<property name="countryCode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`COUNTRYCODE`"/>
 		</property>
-		<list name="location" table="`GLOBALADDRESSAUDITING_LOCATION`" lazy="true" cascade="all">
+		<list name="location" table="`GLOBALADDRESSAUDITING_LOCATIONAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`GLOBALADDRESSAUDITING_LOCATION_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyAction_hsqldb_h_o_hibernate.hbm.xml
index ed90d3c3b..9e89b729a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyAction_hsqldb_h_o_hibernate.hbm.xml
@@ -219,14 +219,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="extra" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="extra" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="extra" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="extra" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -279,7 +279,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="extra" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="extra" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_hsqldb_h_o_hibernate.hbm.xml
index 9c4313349..923feaa36 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_hsqldb_h_o_hibernate.hbm.xml
@@ -228,14 +228,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="extra" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="extra" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="extra" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="extra" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -288,7 +288,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="extra" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="extra" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyMoreAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyMoreAction_hsqldb_h_o_hibernate.hbm.xml
index ed90d3c3b..9e89b729a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyMoreAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyMoreAction_hsqldb_h_o_hibernate.hbm.xml
@@ -219,14 +219,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="extra" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="extra" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="extra" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="extra" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -279,7 +279,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="extra" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="extra" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryInterfaceQueryTest_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryInterfaceQueryTest_hsqldb_h_o_hibernate.hbm.xml
index 4cb4d9e07..6a8dc8f8f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryInterfaceQueryTest_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryInterfaceQueryTest_hsqldb_h_o_hibernate.hbm.xml
@@ -223,14 +223,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -283,7 +283,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAction_hsqldb_h_o_hibernate.hbm.xml
index e080b6b0a..4671738e2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAction_hsqldb_h_o_hibernate.hbm.xml
@@ -219,14 +219,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -279,7 +279,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAddContentAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAddContentAction_hsqldb_h_o_hibernate.hbm.xml
index e080b6b0a..4671738e2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAddContentAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibrarySessionControllerAddContentAction_hsqldb_h_o_hibernate.hbm.xml
@@ -219,14 +219,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -279,7 +279,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_hsqldb_h_o_hibernate.hbm.xml
index 408489b04..2cfcbed70 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_hsqldb_h_o_hibernate.hbm.xml
@@ -228,14 +228,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`COL_NAME`" length="50"/>
 		</property>
-		<list name="writers" table="`TAB_LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`TAB_LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`COL_LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`COL_LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`TAB_LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`TAB_LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`COL_LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -289,7 +289,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`COL_NAME`" length="50"/>
 		</property>
-		<list name="books" table="`TAB_WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`TAB_WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`COL_WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/SchoolLibraryTest$1_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/SchoolLibraryTest$1_hsqldb_h_o_hibernate.hbm.xml
index 71430c3e8..a946dd3d9 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/SchoolLibraryTest$1_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/SchoolLibraryTest$1_hsqldb_h_o_hibernate.hbm.xml
@@ -254,14 +254,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -315,7 +315,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -480,14 +480,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`SCHOOLLIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`SCHOOLLIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SCHOOLLIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SCHOOLLIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`SCHOOLLIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`SCHOOLLIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`SCHOOLLIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/TestLazyUtilsAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/TestLazyUtilsAction_hsqldb_h_o_hibernate.hbm.xml
index e080b6b0a..4671738e2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/TestLazyUtilsAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/TestLazyUtilsAction_hsqldb_h_o_hibernate.hbm.xml
@@ -219,14 +219,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -279,7 +279,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_hsqldb_h_o_hibernate.hbm.xml
index 85cbc4ab4..14458d3b5 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_hsqldb_h_o_hibernate.hbm.xml
@@ -192,7 +192,7 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
 		</property>
-		<list name="carWheel" table="`CARFRAMEAUDITING_CARWHEEL`" lazy="true" cascade="all">
+		<list name="carWheel" table="`CARFRAMEAUDITING_CARWHEELAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`CARFRAMEAUDITING_CARWHEEL_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -297,14 +297,14 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
 		</property>
-		<list name="carType" table="`CARSLISTAUDITING_CARTYPE`" lazy="true" cascade="all">
+		<list name="carType" table="`CARSLISTAUDITING_CARTYPEAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`CARSLISTAUDITING_CARTYPE_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`CARSLISTAUDITING_CARTYPE_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="carLink" table="`CARSLISTAUDITING_CARLINK`" lazy="true" cascade="all">
+		<list name="carLink" table="`CARSLISTAUDITING_CARLINKAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`CARSLISTAUDITING_CARLINK_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -400,7 +400,7 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
 		</property>
-		<list name="carFrame" table="`CARTYPEAUDITING_CARFRAME`" lazy="true" cascade="all">
+		<list name="carFrame" table="`CARTYPEAUDITING_CARFRAMEAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`CARTYPEAUDITING_CARFRAME_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -453,7 +453,7 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
 		</property>
-		<list name="carTire" table="`CARWHEELAUDITING_CARTIRE`" lazy="true" cascade="all">
+		<list name="carTire" table="`CARWHEELAUDITING_CARTIREAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`CARWHEELAUDITING_CARTIRE_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/FleetAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/FleetAction_hsqldb_h_o_hibernate.hbm.xml
index cb47e7919..ae537f490 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/FleetAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/FleetAction_hsqldb_h_o_hibernate.hbm.xml
@@ -508,7 +508,7 @@
 		<property name="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`LENGTH`"/>
 		</property>
-		<list name="availableColors" table="`VEHICLEAUDITING_AVAILABLECOLORS`" lazy="true" cascade="all">
+		<list name="availableColors" table="`VEHICLEAUDITING_AVAILABLECOLORSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`VEHICLEAUDITING_AVAILABLECOLORS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -518,7 +518,7 @@
 		<property name="owner" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`OWNER`"/>
 		</property>
-		<list name="manufacturedAt" table="`VEHICLEAUDITING_MANUFACTUREDAT`" lazy="true" cascade="all">
+		<list name="manufacturedAt" table="`VEHICLEAUDITING_MANUFACTUREDATAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`VEHICLEAUDITING_MANUFACTUREDAT_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -574,7 +574,7 @@
 		<property name="date" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
 			<column not-null="false" unique="false" name="`DATE`"/>
 		</property>
-		<array name="touchedAttributes" table="`PERSONAUDITING_TOUCHEDATTRIBUTES`" cascade="all">
+		<array name="touchedAttributes" table="`PERSONAUDITING_TOUCHEDATTRIBUTESAUDITING`" cascade="all">
 			<key update="true">
 				<column name="`PERSONAUDITING_TOUCHEDATTRIBUTES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -596,14 +596,14 @@
 		<property name="employed" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
 			<column not-null="false" unique="false" name="`EMPLOYED`"/>
 		</property>
-		<list name="addresses" table="`PERSONAUDITING_ADDRESSES`" lazy="true" cascade="all">
+		<list name="addresses" table="`PERSONAUDITING_ADDRESSESAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`PERSONAUDITING_ADDRESSES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`PERSONAUDITING_ADDRESSES_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="ownedVehicles" table="`PERSONAUDITING_OWNEDVEHICLES`" lazy="true" cascade="all">
+		<list name="ownedVehicles" table="`PERSONAUDITING_OWNEDVEHICLESAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`PERSONAUDITING_OWNEDVEHICLES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -659,7 +659,7 @@
 		<property name="date" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
 			<column not-null="false" unique="false" name="`DATE`"/>
 		</property>
-		<array name="touchedAttributes" table="`ADDRESSAUDITING_TOUCHEDATTRIBUTES`" cascade="all">
+		<array name="touchedAttributes" table="`ADDRESSAUDITING_TOUCHEDATTRIBUTESAUDITING`" cascade="all">
 			<key update="true">
 				<column name="`ADDRESSAUDITING_TOUCHEDATTRIBUTES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -834,7 +834,7 @@
 		<property name="date" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
 			<column not-null="false" unique="false" name="`DATE`"/>
 		</property>
-		<array name="touchedAttributes" table="`FLEETAUDITING_TOUCHEDATTRIBUTES`" cascade="all">
+		<array name="touchedAttributes" table="`FLEETAUDITING_TOUCHEDATTRIBUTESAUDITING`" cascade="all">
 			<key update="true">
 				<column name="`FLEETAUDITING_TOUCHEDATTRIBUTES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -850,14 +850,14 @@
 		<property name="id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`ID`"/>
 		</property>
-		<list name="vehicles" table="`FLEETAUDITING_VEHICLES`" lazy="true" cascade="all">
+		<list name="vehicles" table="`FLEETAUDITING_VEHICLESAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`FLEETAUDITING_VEHICLES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`FLEETAUDITING_VEHICLES_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="vehicleInformation" table="`FLEETAUDITING_VEHICLEINFORMATION`" lazy="true" cascade="all">
+		<list name="vehicleInformation" table="`FLEETAUDITING_VEHICLEINFORMATIONAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`FLEETAUDITING_VEHICLEINFORMATION_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -913,7 +913,7 @@
 		<property name="date" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
 			<column not-null="false" unique="false" name="`DATE`"/>
 		</property>
-		<array name="touchedAttributes" table="`GARAGEAUDITING_TOUCHEDATTRIBUTES`" cascade="all">
+		<array name="touchedAttributes" table="`GARAGEAUDITING_TOUCHEDATTRIBUTESAUDITING`" cascade="all">
 			<key update="true">
 				<column name="`GARAGEAUDITING_TOUCHEDATTRIBUTES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -926,7 +926,7 @@
 		<property name="versionHolderContainment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`VERSIONHOLDERCONTAINMENT`"/>
 		</property>
-		<list name="vehicles" table="`GARAGEAUDITING_VEHICLES`" lazy="true" cascade="all">
+		<list name="vehicles" table="`GARAGEAUDITING_VEHICLESAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`GARAGEAUDITING_VEHICLES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -939,7 +939,7 @@
 		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`ADDRESS`"/>
 		</property>
-		<list name="fleetsUsingGarage" table="`GARAGEAUDITING_FLEETSUSINGGARAGE`" lazy="true" cascade="all">
+		<list name="fleetsUsingGarage" table="`GARAGEAUDITING_FLEETSUSINGGARAGEAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`GARAGEAUDITING_FLEETSUSINGGARAGE_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -1077,7 +1077,7 @@
 		<property name="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`LENGTH`"/>
 		</property>
-		<list name="availableColors" table="`HYBRIDAUDITING_AVAILABLECOLORS`" lazy="true" cascade="all">
+		<list name="availableColors" table="`HYBRIDAUDITING_AVAILABLECOLORSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`HYBRIDAUDITING_AVAILABLECOLORS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -1087,7 +1087,7 @@
 		<property name="owner" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`OWNER`"/>
 		</property>
-		<list name="manufacturedAt" table="`HYBRIDAUDITING_MANUFACTUREDAT`" lazy="true" cascade="all">
+		<list name="manufacturedAt" table="`HYBRIDAUDITING_MANUFACTUREDATAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`HYBRIDAUDITING_MANUFACTUREDAT_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -1100,7 +1100,7 @@
 		<property name="date" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
 			<column not-null="false" unique="false" name="`DATE`"/>
 		</property>
-		<array name="touchedAttributes" table="`HYBRIDAUDITING_TOUCHEDATTRIBUTES`" cascade="all">
+		<array name="touchedAttributes" table="`HYBRIDAUDITING_TOUCHEDATTRIBUTESAUDITING`" cascade="all">
 			<key update="true">
 				<column name="`HYBRIDAUDITING_TOUCHEDATTRIBUTES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -1119,7 +1119,7 @@
 		<property name="numTires" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`NUMTIRES`"/>
 		</property>
-		<list name="tires" table="`HYBRIDAUDITING_TIRES`" lazy="true" cascade="all">
+		<list name="tires" table="`HYBRIDAUDITING_TIRESAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`HYBRIDAUDITING_TIRES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -1202,7 +1202,7 @@
 		<property name="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`LENGTH`"/>
 		</property>
-		<list name="availableColors" table="`CARAUDITING_AVAILABLECOLORS`" lazy="true" cascade="all">
+		<list name="availableColors" table="`CARAUDITING_AVAILABLECOLORSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`CARAUDITING_AVAILABLECOLORS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -1212,7 +1212,7 @@
 		<property name="owner" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`OWNER`"/>
 		</property>
-		<list name="manufacturedAt" table="`CARAUDITING_MANUFACTUREDAT`" lazy="true" cascade="all">
+		<list name="manufacturedAt" table="`CARAUDITING_MANUFACTUREDATAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`CARAUDITING_MANUFACTUREDAT_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -1225,7 +1225,7 @@
 		<property name="date" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
 			<column not-null="false" unique="false" name="`DATE`"/>
 		</property>
-		<array name="touchedAttributes" table="`CARAUDITING_TOUCHEDATTRIBUTES`" cascade="all">
+		<array name="touchedAttributes" table="`CARAUDITING_TOUCHEDATTRIBUTESAUDITING`" cascade="all">
 			<key update="true">
 				<column name="`CARAUDITING_TOUCHEDATTRIBUTES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -1244,7 +1244,7 @@
 		<property name="numTires" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
 			<column not-null="false" unique="false" name="`NUMTIRES`"/>
 		</property>
-		<list name="tires" table="`CARAUDITING_TIRES`" lazy="true" cascade="all">
+		<list name="tires" table="`CARAUDITING_TIRESAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`CARAUDITING_TIRES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -1355,7 +1355,7 @@
 		<property name="makesDieselEngines" lazy="false" insert="true" update="true" not-null="false" unique="false" type="boolean">
 			<column not-null="false" unique="false" name="`MAKESDIESELENGINES`"/>
 		</property>
-		<list name="brands" table="`ENGINEFACTORYAUDITING_BRANDS`" lazy="true" cascade="all">
+		<list name="brands" table="`ENGINEFACTORYAUDITING_BRANDSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`ENGINEFACTORYAUDITING_BRANDS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -1408,7 +1408,7 @@
 		<property name="date" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
 			<column not-null="false" unique="false" name="`DATE`"/>
 		</property>
-		<array name="touchedAttributes" table="`USADDRESSAUDITING_TOUCHEDATTRIBUTES`" cascade="all">
+		<array name="touchedAttributes" table="`USADDRESSAUDITING_TOUCHEDATTRIBUTESAUDITING`" cascade="all">
 			<key update="true">
 				<column name="`USADDRESSAUDITING_TOUCHEDATTRIBUTES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -1586,7 +1586,7 @@
 		<property name="date" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
 			<column not-null="false" unique="false" name="`DATE`"/>
 		</property>
-		<array name="touchedAttributes" table="`TEMPORALAUDITING_TOUCHEDATTRIBUTES`" cascade="all">
+		<array name="touchedAttributes" table="`TEMPORALAUDITING_TOUCHEDATTRIBUTESAUDITING`" cascade="all">
 			<key update="true">
 				<column name="`TEMPORALAUDITING_TOUCHEDATTRIBUTES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -1642,7 +1642,7 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
 		</property>
-		<list name="versions" table="`VERSIONHOLDERAUDITING_VERSIONS`" lazy="true" cascade="all">
+		<list name="versions" table="`VERSIONHOLDERAUDITING_VERSIONSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`VERSIONHOLDERAUDITING_VERSIONS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_hsqldb_h_o_hibernate.hbm.xml
index 921148e71..ab83c884f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_hsqldb_h_o_hibernate.hbm.xml
@@ -369,7 +369,7 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
 		</property>
-		<list name="library" table="`BOOKSINLIBAUDITING_LIBRARY`" lazy="true" cascade="all">
+		<list name="library" table="`BOOKSINLIBAUDITING_LIBRARYAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`BOOKSINLIBAUDITING_LIBRARY_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -567,14 +567,14 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
 		</property>
-		<list name="library" table="`LIBRARYAUDITING_LIBRARY`" lazy="true" cascade="all">
+		<list name="library" table="`LIBRARYAUDITING_LIBRARYAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_LIBRARY_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_LIBRARY_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="abstractBookDefinitionGroup" table="`LIBRARYAUDITING_ABSTRACTBOOKDEFINITIONGROUP`" lazy="true" cascade="all,delete-orphan">
+		<list name="abstractBookDefinitionGroup" table="`LIBRARYAUDITING_ABSTRACTBOOKDEFINITIONGROUPAUDITING`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_ABSTRACTBOOKDEFINITIONGROUP_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDBothAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDBothAction_hsqldb_h_o_hibernate.hbm.xml
index e080b6b0a..4671738e2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDBothAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDBothAction_hsqldb_h_o_hibernate.hbm.xml
@@ -219,14 +219,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -279,7 +279,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDFeatureIDAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDFeatureIDAction_hsqldb_h_o_hibernate.hbm.xml
index e080b6b0a..4671738e2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDFeatureIDAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryContainerFeatureIDFeatureIDAction_hsqldb_h_o_hibernate.hbm.xml
@@ -219,14 +219,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -279,7 +279,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryFKAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryFKAction_hsqldb_h_o_hibernate.hbm.xml
index fef1156d6..ab22fc329 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryFKAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryFKAction_hsqldb_h_o_hibernate.hbm.xml
@@ -228,14 +228,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`" length="50"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -289,7 +289,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`" length="50"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_hsqldb_h_o_hibernate.hbm.xml
index d228dfa0f..6643e2222 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_hsqldb_h_o_hibernate.hbm.xml
@@ -232,14 +232,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -293,7 +293,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsBagAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsBagAction_hsqldb_h_o_hibernate.hbm.xml
index 35397ebe0..c9df26bed 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsBagAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryListAsBagAction_hsqldb_h_o_hibernate.hbm.xml
@@ -216,14 +216,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -276,7 +276,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNonResolvingAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNonResolvingAction_hsqldb_h_o_hibernate.hbm.xml
index e080b6b0a..4671738e2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNonResolvingAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNonResolvingAction_hsqldb_h_o_hibernate.hbm.xml
@@ -219,14 +219,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -279,7 +279,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNotifyingTestAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNotifyingTestAction_hsqldb_h_o_hibernate.hbm.xml
index e080b6b0a..4671738e2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNotifyingTestAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryNotifyingTestAction_hsqldb_h_o_hibernate.hbm.xml
@@ -219,14 +219,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -279,7 +279,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryQualifyActionHB_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryQualifyActionHB_hsqldb_h_o_hibernate.hbm.xml
index 225cafbe9..1f1f28a3b 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryQualifyActionHB_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryQualifyActionHB_hsqldb_h_o_hibernate.hbm.xml
@@ -219,14 +219,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -279,7 +279,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`LIBRARYAUDITING_WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceAction_hsqldb_h_o_hibernate.hbm.xml
index e080b6b0a..4671738e2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceAction_hsqldb_h_o_hibernate.hbm.xml
@@ -219,14 +219,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -279,7 +279,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceCutPasteAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceCutPasteAction_hsqldb_h_o_hibernate.hbm.xml
index 00b5512dc..d0877582f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceCutPasteAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceCutPasteAction_hsqldb_h_o_hibernate.hbm.xml
@@ -219,14 +219,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -279,7 +279,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceVisitTreeAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceVisitTreeAction_hsqldb_h_o_hibernate.hbm.xml
index e080b6b0a..4671738e2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceVisitTreeAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryResourceVisitTreeAction_hsqldb_h_o_hibernate.hbm.xml
@@ -219,14 +219,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -279,7 +279,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibrarySerializationAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibrarySerializationAction_hsqldb_h_o_hibernate.hbm.xml
index e080b6b0a..4671738e2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibrarySerializationAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibrarySerializationAction_hsqldb_h_o_hibernate.hbm.xml
@@ -219,14 +219,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -279,7 +279,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ListAsIdBagAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ListAsIdBagAction_hsqldb_h_o_hibernate.hbm.xml
index cfb6a339f..a53adaa5f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ListAsIdBagAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ListAsIdBagAction_hsqldb_h_o_hibernate.hbm.xml
@@ -106,7 +106,7 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
 		</property>
-		<list name="manies" table="`ONEAUDITING_MANIES`" lazy="true" cascade="all">
+		<list name="manies" table="`ONEAUDITING_MANIESAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`ONEAUDITING_MANIES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/MindMapAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/MindMapAction_hsqldb_h_o_hibernate.hbm.xml
index e1796cbc7..e92527eba 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/MindMapAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/MindMapAction_hsqldb_h_o_hibernate.hbm.xml
@@ -350,21 +350,21 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
 		</property>
-		<list name="rootTopics" table="`MAPAUDITING_ROOTTOPICS`" lazy="true" cascade="all">
+		<list name="rootTopics" table="`MAPAUDITING_ROOTTOPICSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`MAPAUDITING_ROOTTOPICS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`MAPAUDITING_ROOTTOPICS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="relations" table="`MAPAUDITING_RELATIONS`" lazy="true" cascade="all">
+		<list name="relations" table="`MAPAUDITING_RELATIONSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`MAPAUDITING_RELATIONS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`MAPAUDITING_RELATIONS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="resources" table="`MAPAUDITING_RESOURCES`" lazy="true" cascade="all">
+		<list name="resources" table="`MAPAUDITING_RESOURCESAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`MAPAUDITING_RESOURCES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -477,7 +477,7 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
 		</property>
-		<list name="comments" table="`RESOURCEAUDITING_COMMENTS`" lazy="true" cascade="all">
+		<list name="comments" table="`RESOURCEAUDITING_COMMENTSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`RESOURCEAUDITING_COMMENTS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -490,7 +490,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="topics" table="`RESOURCEAUDITING_TOPICS`" lazy="true" cascade="all">
+		<list name="topics" table="`RESOURCEAUDITING_TOPICSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`RESOURCEAUDITING_TOPICS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -540,7 +540,7 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
 		</property>
-		<list name="items" table="`THREADAUDITING_ITEMS`" lazy="true" cascade="all">
+		<list name="items" table="`THREADAUDITING_ITEMSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`THREADAUDITING_ITEMS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -651,7 +651,7 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
 		</property>
-		<list name="comments" table="`TOPICAUDITING_COMMENTS`" lazy="true" cascade="all">
+		<list name="comments" table="`TOPICAUDITING_COMMENTSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`TOPICAUDITING_COMMENTS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -678,7 +678,7 @@
 				<param name="epackage">http://www.example.org/mindmap</param>
 			</type>
 		</property>
-		<list name="resources" table="`TOPICAUDITING_RESOURCES`" lazy="true" cascade="all">
+		<list name="resources" table="`TOPICAUDITING_RESOURCESAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`TOPICAUDITING_RESOURCES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -688,7 +688,7 @@
 		<property name="startDate" lazy="false" insert="true" update="true" not-null="false" unique="false" type="org.eclipse.emf.teneo.hibernate.mapping.XSDDate">
 			<column not-null="false" unique="false" name="`STARTDATE`"/>
 		</property>
-		<list name="subtopics" table="`TOPICAUDITING_SUBTOPICS`" lazy="true" cascade="all">
+		<list name="subtopics" table="`TOPICAUDITING_SUBTOPICSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`TOPICAUDITING_SUBTOPICS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/NoEscapeLibraryAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/NoEscapeLibraryAction_hsqldb_h_o_hibernate.hbm.xml
index 81ca85245..42c67bd6a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/NoEscapeLibraryAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/NoEscapeLibraryAction_hsqldb_h_o_hibernate.hbm.xml
@@ -228,14 +228,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="NAME" length="50"/>
 		</property>
-		<list name="writers" table="LIBRARYAUDITING_WRITERS" lazy="true" cascade="all">
+		<list name="writers" table="LIBRARYAUDITING_WRITERSAUDITING" lazy="true" cascade="all">
 			<key update="true">
 				<column name="LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID" unique="false"/>
 			</key>
 			<list-index column="LIBRARYAUDITING_WRITERS_IDX"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="LIBRARYAUDITING_BOOKS" lazy="true" cascade="all">
+		<list name="books" table="LIBRARYAUDITING_BOOKSAUDITING" lazy="true" cascade="all">
 			<key update="true">
 				<column name="LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID" unique="false"/>
 			</key>
@@ -289,7 +289,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="NAME" length="50"/>
 		</property>
-		<list name="books" table="WRITERAUDITING_BOOKS" lazy="true" cascade="all">
+		<list name="books" table="WRITERAUDITING_BOOKSAUDITING" lazy="true" cascade="all">
 			<key update="true">
 				<column name="WRITERAUDITING_BOOKS_TENEO_AUDIT_ID" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PrimerPOAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PrimerPOAction_hsqldb_h_o_hibernate.hbm.xml
index d8d96bfd3..b33fd12f4 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PrimerPOAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PrimerPOAction_hsqldb_h_o_hibernate.hbm.xml
@@ -297,7 +297,7 @@
 		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`COMMENT`"/>
 		</property>
-		<list name="items" table="`PURCHASEORDERAUDITING_ITEMS`" lazy="true" cascade="all">
+		<list name="items" table="`PURCHASEORDERAUDITING_ITEMSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`PURCHASEORDERAUDITING_ITEMS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ProductAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ProductAction_hsqldb_h_o_hibernate.hbm.xml
index 0054fa967..d709e2307 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ProductAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/ProductAction_hsqldb_h_o_hibernate.hbm.xml
@@ -158,7 +158,7 @@
 		<property name="AnyOne" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`ANYONE`"/>
 		</property>
-		<list name="AnyList" table="`PRODUCTTYPEAUDITING_ANYLIST`" lazy="true" cascade="all">
+		<list name="AnyList" table="`PRODUCTTYPEAUDITING_ANYLISTAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`PRODUCTTYPEAUDITING_ANYLIST_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalMapAsClassAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalMapAsClassAction_hsqldb_h_o_hibernate.hbm.xml
index 70bc8692a..535698e49 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalMapAsClassAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalMapAsClassAction_hsqldb_h_o_hibernate.hbm.xml
@@ -354,7 +354,7 @@
 		<property name="cost" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
 			<column not-null="false" unique="false" name="`COST`"/>
 		</property>
-		<list name="rentalUnits" table="`RENTALCONTRACTAUDITING_RENTALUNITS`" lazy="true" cascade="all">
+		<list name="rentalUnits" table="`RENTALCONTRACTAUDITING_RENTALUNITSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`RENTALCONTRACTAUDITING_RENTALUNITS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalResourceReferenceAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalResourceReferenceAction_hsqldb_h_o_hibernate.hbm.xml
index 41c069817..d4191079a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalResourceReferenceAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/RentalResourceReferenceAction_hsqldb_h_o_hibernate.hbm.xml
@@ -354,7 +354,7 @@
 		<property name="cost" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
 			<column not-null="false" unique="false" name="`COST`"/>
 		</property>
-		<list name="rentalUnits" table="`RENTALCONTRACTAUDITING_RENTALUNITS`" lazy="true" cascade="all">
+		<list name="rentalUnits" table="`RENTALCONTRACTAUDITING_RENTALUNITSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`RENTALCONTRACTAUDITING_RENTALUNITS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryResourceAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryResourceAction_hsqldb_h_o_hibernate.hbm.xml
index e080b6b0a..4671738e2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryResourceAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleLibraryResourceAction_hsqldb_h_o_hibernate.hbm.xml
@@ -219,14 +219,14 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="writers" table="`LIBRARYAUDITING_WRITERS`" lazy="true" cascade="all">
+		<list name="writers" table="`LIBRARYAUDITING_WRITERSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_WRITERS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
@@ -279,7 +279,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`WRITERAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`WRITERAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`WRITERAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleRentalAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleRentalAction_hsqldb_h_o_hibernate.hbm.xml
index 41c069817..d4191079a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleRentalAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SimpleRentalAction_hsqldb_h_o_hibernate.hbm.xml
@@ -354,7 +354,7 @@
 		<property name="cost" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
 			<column not-null="false" unique="false" name="`COST`"/>
 		</property>
-		<list name="rentalUnits" table="`RENTALCONTRACTAUDITING_RENTALUNITS`" lazy="true" cascade="all">
+		<list name="rentalUnits" table="`RENTALCONTRACTAUDITING_RENTALUNITSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`RENTALCONTRACTAUDITING_RENTALUNITS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceUnloadAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceUnloadAction_hsqldb_h_o_hibernate.hbm.xml
index 81f9c1843..755932e43 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceUnloadAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/ResourceUnloadAction_hsqldb_h_o_hibernate.hbm.xml
@@ -154,7 +154,7 @@
 		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
-		<list name="books" table="`LIBRARYAUDITING_BOOKS`" lazy="true" cascade="all">
+		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/auditing/SimpleLibraryAuditingAction.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/auditing/SimpleLibraryAuditingAction.java
index 26915b626..a93ba24c6 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/auditing/SimpleLibraryAuditingAction.java
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/auditing/SimpleLibraryAuditingAction.java
@@ -9,7 +9,10 @@
 package org.eclipse.emf.teneo.hibernate.test.emf.auditing;
 
 import java.util.List;
+import java.util.Properties;
 
+import org.eclipse.emf.teneo.PersistenceOptions;
+import org.eclipse.emf.teneo.hibernate.HbDataStore;
 import org.eclipse.emf.teneo.hibernate.auditing.AuditVersionProvider;
 import org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditEntry;
 import org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind;
@@ -40,12 +43,27 @@ public class SimpleLibraryAuditingAction extends AbstractTestAction {
 		super(LibraryPackage.eINSTANCE);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.emf.teneo.test.AbstractTestAction#getExtraConfigurationProperties ()
+	 */
+	@Override
+	public Properties getExtraConfigurationProperties() {
+		final Properties props = new Properties();
+		// props.put(PersistenceOptions.AUDITING_DB_SCHEMA, "dbschema");
+		props.put(PersistenceOptions.AUDITING_PRUNE_OLD_ENTRIES_DAYS, "1");
+		props.put(PersistenceOptions.AUDITING_PRUNE_COMMIT_INTERVAL, "10");
+		return props;
+	}
+
 	/** Creates an item, an address and links them to a po. */
 	@Override
 	public void doAction(TestStore store) {
 		testSimpleChange(store);
 		testContainer(store);
 		testQuery(store);
+		testEntryPruning(store);
 	}
 
 	private void testSimpleChange(TestStore store) {
@@ -230,4 +248,69 @@ public class SimpleLibraryAuditingAction extends AbstractTestAction {
 			}
 		}
 	}
+
+	private void testEntryPruning(TestStore store) {
+		{
+			store.beginTransaction();
+			final Library library = store.getObject(Library.class);
+			store.deleteObject(library);
+			store.commitTransaction();
+		}
+
+		final HibernateTestStore testStore = (HibernateTestStore) store;
+		final HbDataStore dataStore = testStore.getEmfDataStore();
+		final long currentPruneTime = dataStore.getAuditProcessHandler().getPruneTime();
+		assertTrue(currentPruneTime == (24 * 1000 * 3600));
+		dataStore.getAuditProcessHandler().setPruneTime(500);
+		Object id = null;
+		{
+			store.beginTransaction();
+			final Library library = LibraryFactory.eINSTANCE.createLibrary();
+			library.setName("abc");
+			store.store(library);
+			store.commitTransaction();
+			id = IdentifierCacheHandler.getInstance().getID(library);
+		}
+		{
+			for (int i = 0; i < 8; i++) {
+				store.beginTransaction();
+				final Library library = store.getObject(Library.class);
+				library.setName("def" + i + System.currentTimeMillis());
+				store.store(library);
+				store.commitTransaction();
+			}
+		}
+
+		int size1 = 0;
+		{
+			store.beginTransaction();
+			final AuditVersionProvider vp = testStore.getEmfDataStore().getAuditVersionProvider();
+			final List<TeneoAuditEntry> entries = vp.getAllAuditEntries(
+					LibraryPackage.eINSTANCE.getLibrary(), id);
+			size1 = entries.size();
+			store.commitTransaction();
+		}
+		try {
+			Thread.sleep(500);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+		{
+			for (int i = 0; i < 5; i++) {
+				store.beginTransaction();
+				final Library library = store.getObject(Library.class);
+				library.setName("def" + i + System.currentTimeMillis());
+				store.store(library);
+				store.commitTransaction();
+			}
+		}
+		{
+			store.beginTransaction();
+			final AuditVersionProvider vp = testStore.getEmfDataStore().getAuditVersionProvider();
+			final List<TeneoAuditEntry> entries = vp.getAllAuditEntries(
+					LibraryPackage.eINSTANCE.getLibrary(), id);
+			assertTrue(size1 > entries.size());
+			store.commitTransaction();
+		}
+	}
 }
\ No newline at end of file