Solve concurent exception in eclipselink and wrong generation of m2m join table

8 files changed, 38 insertions, 38 deletions

diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280480Action_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280480Action_hsqldb_e_o_hibernate.hbm.xml
index c6c5aa0c3..5192e7237 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280480Action_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280480Action_hsqldb_e_o_hibernate.hbm.xml
@@ -191,7 +191,7 @@
 		</version>
 		<list name="mixed" table="`KEYINFOTYPE_MIXED`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
-				<column name="`KEYINFOTYPE_MIXED_E_ID`" unique="false"/>
+				<column name="`KEYINFOTYPE_MIXED_ID`" unique="false"/>
 			</key>
 			<list-index column="`KEYINFOTYPE_MIXED_IDX`"/>
 			<one-to-many entity-name="KeyInfoType_mixed"/>
@@ -208,7 +208,7 @@
 		<property name="fme_feature" type="java.lang.String"/>
 		<list name="group" table="`MIXED_KEYINFOTYPE_GROUP`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
-				<column name="`MIXED_KEYINFOTYPE_GROUP_E_ID`" unique="false"/>
+				<column name="`MIXED_KEYINFOTYPE_GROUP_ID`" unique="false"/>
 			</key>
 			<list-index column="`MIXED_KEYINFOTYPE_GROUP_IDX`"/>
 			<one-to-many entity-name="KeyInfoType_group"/>
@@ -359,7 +359,7 @@
 		</version>
 		<list name="reference" lazy="true" cascade="all,delete-orphan">
 			<key update="true" foreign-key="MANIFESTTYPE_REFERENCE">
-				<column name="`MANIFESTTYPE_REFERENCE_E_ID`" unique="false"/>
+				<column name="`MANIFESTTYPE_REFERENCE_ID`" unique="false"/>
 			</key>
 			<list-index column="`MANIFESTTYPE_REFERENCE_IDX`"/>
 			<one-to-many entity-name="ReferenceType"/>
@@ -376,7 +376,7 @@
 		</version>
 		<list name="mixed" table="`OBJECTTYPE_MIXED`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
-				<column name="`OBJECTTYPE_MIXED_E_ID`" unique="false"/>
+				<column name="`OBJECTTYPE_MIXED_ID`" unique="false"/>
 			</key>
 			<list-index column="`OBJECTTYPE_MIXED_IDX`"/>
 			<one-to-many entity-name="ObjectType_mixed"/>
@@ -399,7 +399,7 @@
 		<property name="fme_feature" type="java.lang.String"/>
 		<list name="group" table="`MIXED_OBJECTTYPE_GROUP`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
-				<column name="`MIXED_OBJECTTYPE_GROUP_E_ID`" unique="false"/>
+				<column name="`MIXED_OBJECTTYPE_GROUP_ID`" unique="false"/>
 			</key>
 			<list-index column="`MIXED_OBJECTTYPE_GROUP_IDX`"/>
 			<one-to-many entity-name="ObjectType_group"/>
@@ -537,7 +537,7 @@
 		</many-to-one>
 		<array name="digestValue" table="`REFERENCETYPE_DIGESTVALUE`" cascade="all,delete-orphan">
 			<key update="true">
-				<column name="`REFERENCETYPE_DIGESTVALUE_E_ID`" unique="false"/>
+				<column name="`REFERENCETYPE_DIGESTVALUE_ID`" unique="false"/>
 			</key>
 			<list-index column="`REFERENCETYPE_DIGESTVALUE_IDX`"/>
 			<element type="byte"/>
@@ -667,7 +667,7 @@
 		</version>
 		<list name="signatureProperty" lazy="true" cascade="all,delete-orphan">
 			<key update="true" foreign-key="SIGNATUREPROPERTIESTYPE_SIGNATUREPROPERTY">
-				<column name="`SIGNATUREPROPERTIESTYPE_SIGNATUREPROPERTY_E_ID`" unique="false"/>
+				<column name="`SIGNATUREPROPERTIESTYPE_SIGNATUREPROPERTY_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIGNATUREPROPERTIESTYPE_SIGNATUREPROPERTY_IDX`"/>
 			<one-to-many entity-name="SignaturePropertyType"/>
@@ -684,7 +684,7 @@
 		</version>
 		<list name="mixed" table="`SIGNATUREPROPERTYTYPE_MIXED`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
-				<column name="`SIGNATUREPROPERTYTYPE_MIXED_E_ID`" unique="false"/>
+				<column name="`SIGNATUREPROPERTYTYPE_MIXED_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIGNATUREPROPERTYTYPE_MIXED_IDX`"/>
 			<one-to-many entity-name="SignaturePropertyType_mixed"/>
@@ -704,7 +704,7 @@
 		<property name="fme_feature" type="java.lang.String"/>
 		<list name="group" table="`MIXED_SIGNATUREPROPERTYTYPE_GROUP`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
-				<column name="`MIXED_SIGNATUREPROPERTYTYPE_GROUP_E_ID`" unique="false"/>
+				<column name="`MIXED_SIGNATUREPROPERTYTYPE_GROUP_ID`" unique="false"/>
 			</key>
 			<list-index column="`MIXED_SIGNATUREPROPERTYTYPE_GROUP_IDX`"/>
 			<one-to-many entity-name="SignaturePropertyType_group"/>
@@ -756,17 +756,17 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<many-to-one name="signedInfo" entity-name="SignedInfoType" lazy="false" cascade="all" foreign-key="SIGNATURETYPE_SIGNEDINFO" insert="true" update="true" not-null="true" unique="true">
-			<column not-null="true" unique="false" name="`SIGNEDINFOTYPE_SIGNEDINFO_E_ID`"/>
+			<column not-null="true" unique="false" name="`SIGNEDINFOTYPE_SIGNEDINFO_ID`"/>
 		</many-to-one>
 		<many-to-one name="signatureValue" entity-name="SignatureValueType" lazy="false" cascade="all" foreign-key="SIGNATURETYPE_SIGNATUREVALUE" insert="true" update="true" not-null="true" unique="true">
-			<column not-null="true" unique="false" name="`SIGNATUREVALUETYPE_SIGNATUREVALUE_E_ID`"/>
+			<column not-null="true" unique="false" name="`SIGNATUREVALUETYPE_SIGNATUREVALUE_ID`"/>
 		</many-to-one>
 		<many-to-one name="keyInfo" entity-name="KeyInfoType" lazy="false" cascade="all" foreign-key="SIGNATURETYPE_KEYINFO" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`KEYINFOTYPE_KEYINFO_ID`"/>
 		</many-to-one>
 		<list name="object" lazy="true" cascade="all,delete-orphan">
 			<key update="true" foreign-key="SIGNATURETYPE_OBJECT">
-				<column name="`SIGNATURETYPE_OBJECT_E_ID`" unique="false"/>
+				<column name="`SIGNATURETYPE_OBJECT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIGNATURETYPE_OBJECT_IDX`"/>
 			<one-to-many entity-name="ObjectType"/>
@@ -783,7 +783,7 @@
 		</version>
 		<array name="value" table="`SIGNATUREVALUETYPE_VALUE`" cascade="all,delete-orphan">
 			<key update="true">
-				<column name="`SIGNATUREVALUETYPE_VALUE_E_ID`" unique="false"/>
+				<column name="`SIGNATUREVALUETYPE_VALUE_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIGNATUREVALUETYPE_VALUE_IDX`"/>
 			<element type="byte"/>
@@ -806,7 +806,7 @@
 		</many-to-one>
 		<list name="reference" lazy="true" cascade="all,delete-orphan">
 			<key update="true" foreign-key="SIGNEDINFOTYPE_REFERENCE">
-				<column name="`SIGNEDINFOTYPE_REFERENCE_E_ID`" unique="false"/>
+				<column name="`SIGNEDINFOTYPE_REFERENCE_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIGNEDINFOTYPE_REFERENCE_IDX`"/>
 			<one-to-many entity-name="ReferenceType"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280480Action_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280480Action_hsqldb_h_o_hibernate.hbm.xml
index d452b3336..30491e0bf 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280480Action_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz280480Action_hsqldb_h_o_hibernate.hbm.xml
@@ -203,7 +203,7 @@
 		</version>
 		<list name="mixed" table="`KEYINFOTYPE_MIXED`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
-				<column name="`KEYINFOTYPE_MIXED_E_ID`" unique="false"/>
+				<column name="`KEYINFOTYPE_MIXED_ID`" unique="false"/>
 			</key>
 			<list-index column="`KEYINFOTYPE_MIXED_IDX`"/>
 			<one-to-many entity-name="KeyInfoType_mixed"/>
@@ -220,7 +220,7 @@
 		<property name="fme_feature" type="java.lang.String"/>
 		<list name="group" table="`MIXED_KEYINFOTYPE_GROUP`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
-				<column name="`MIXED_KEYINFOTYPE_GROUP_E_ID`" unique="false"/>
+				<column name="`MIXED_KEYINFOTYPE_GROUP_ID`" unique="false"/>
 			</key>
 			<list-index column="`MIXED_KEYINFOTYPE_GROUP_IDX`"/>
 			<one-to-many entity-name="KeyInfoType_group"/>
@@ -377,7 +377,7 @@
 		</version>
 		<list name="reference" lazy="true" cascade="all,delete-orphan">
 			<key update="true" foreign-key="MANIFESTTYPE_REFERENCE">
-				<column name="`MANIFESTTYPE_REFERENCE_E_ID`" unique="false"/>
+				<column name="`MANIFESTTYPE_REFERENCE_ID`" unique="false"/>
 			</key>
 			<list-index column="`MANIFESTTYPE_REFERENCE_IDX`"/>
 			<one-to-many entity-name="ReferenceType"/>
@@ -397,7 +397,7 @@
 		</version>
 		<list name="mixed" table="`OBJECTTYPE_MIXED`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
-				<column name="`OBJECTTYPE_MIXED_E_ID`" unique="false"/>
+				<column name="`OBJECTTYPE_MIXED_ID`" unique="false"/>
 			</key>
 			<list-index column="`OBJECTTYPE_MIXED_IDX`"/>
 			<one-to-many entity-name="ObjectType_mixed"/>
@@ -420,7 +420,7 @@
 		<property name="fme_feature" type="java.lang.String"/>
 		<list name="group" table="`MIXED_OBJECTTYPE_GROUP`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
-				<column name="`MIXED_OBJECTTYPE_GROUP_E_ID`" unique="false"/>
+				<column name="`MIXED_OBJECTTYPE_GROUP_ID`" unique="false"/>
 			</key>
 			<list-index column="`MIXED_OBJECTTYPE_GROUP_IDX`"/>
 			<one-to-many entity-name="ObjectType_group"/>
@@ -564,7 +564,7 @@
 		</many-to-one>
 		<array name="digestValue" table="`REFERENCETYPE_DIGESTVALUE`" cascade="all,delete-orphan">
 			<key update="true">
-				<column name="`REFERENCETYPE_DIGESTVALUE_E_ID`" unique="false"/>
+				<column name="`REFERENCETYPE_DIGESTVALUE_ID`" unique="false"/>
 			</key>
 			<list-index column="`REFERENCETYPE_DIGESTVALUE_IDX`"/>
 			<element type="byte"/>
@@ -706,7 +706,7 @@
 		</version>
 		<list name="signatureProperty" lazy="true" cascade="all,delete-orphan">
 			<key update="true" foreign-key="SIGNATUREPROPERTIESTYPE_SIGNATUREPROPERTY">
-				<column name="`SIGNATUREPROPERTIESTYPE_SIGNATUREPROPERTY_E_ID`" unique="false"/>
+				<column name="`SIGNATUREPROPERTIESTYPE_SIGNATUREPROPERTY_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIGNATUREPROPERTIESTYPE_SIGNATUREPROPERTY_IDX`"/>
 			<one-to-many entity-name="SignaturePropertyType"/>
@@ -726,7 +726,7 @@
 		</version>
 		<list name="mixed" table="`SIGNATUREPROPERTYTYPE_MIXED`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
-				<column name="`SIGNATUREPROPERTYTYPE_MIXED_E_ID`" unique="false"/>
+				<column name="`SIGNATUREPROPERTYTYPE_MIXED_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIGNATUREPROPERTYTYPE_MIXED_IDX`"/>
 			<one-to-many entity-name="SignaturePropertyType_mixed"/>
@@ -746,7 +746,7 @@
 		<property name="fme_feature" type="java.lang.String"/>
 		<list name="group" table="`MIXED_SIGNATUREPROPERTYTYPE_GROUP`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
-				<column name="`MIXED_SIGNATUREPROPERTYTYPE_GROUP_E_ID`" unique="false"/>
+				<column name="`MIXED_SIGNATUREPROPERTYTYPE_GROUP_ID`" unique="false"/>
 			</key>
 			<list-index column="`MIXED_SIGNATUREPROPERTYTYPE_GROUP_IDX`"/>
 			<one-to-many entity-name="SignaturePropertyType_group"/>
@@ -801,17 +801,17 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<many-to-one name="signedInfo" entity-name="SignedInfoType" lazy="false" cascade="all" foreign-key="SIGNATURETYPE_SIGNEDINFO" insert="true" update="true" not-null="true" unique="true">
-			<column not-null="true" unique="false" name="`SIGNEDINFOTYPE_SIGNEDINFO_E_ID`"/>
+			<column not-null="true" unique="false" name="`SIGNEDINFOTYPE_SIGNEDINFO_ID`"/>
 		</many-to-one>
 		<many-to-one name="signatureValue" entity-name="SignatureValueType" lazy="false" cascade="all" foreign-key="SIGNATURETYPE_SIGNATUREVALUE" insert="true" update="true" not-null="true" unique="true">
-			<column not-null="true" unique="false" name="`SIGNATUREVALUETYPE_SIGNATUREVALUE_E_ID`"/>
+			<column not-null="true" unique="false" name="`SIGNATUREVALUETYPE_SIGNATUREVALUE_ID`"/>
 		</many-to-one>
 		<many-to-one name="keyInfo" entity-name="KeyInfoType" lazy="false" cascade="all" foreign-key="SIGNATURETYPE_KEYINFO" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`KEYINFOTYPE_KEYINFO_ID`"/>
 		</many-to-one>
 		<list name="object" lazy="true" cascade="all,delete-orphan">
 			<key update="true" foreign-key="SIGNATURETYPE_OBJECT">
-				<column name="`SIGNATURETYPE_OBJECT_E_ID`" unique="false"/>
+				<column name="`SIGNATURETYPE_OBJECT_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIGNATURETYPE_OBJECT_IDX`"/>
 			<one-to-many entity-name="ObjectType"/>
@@ -831,7 +831,7 @@
 		</version>
 		<array name="value" table="`SIGNATUREVALUETYPE_VALUE`" cascade="all,delete-orphan">
 			<key update="true">
-				<column name="`SIGNATUREVALUETYPE_VALUE_E_ID`" unique="false"/>
+				<column name="`SIGNATUREVALUETYPE_VALUE_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIGNATUREVALUETYPE_VALUE_IDX`"/>
 			<element type="byte"/>
@@ -857,7 +857,7 @@
 		</many-to-one>
 		<list name="reference" lazy="true" cascade="all,delete-orphan">
 			<key update="true" foreign-key="SIGNEDINFOTYPE_REFERENCE">
-				<column name="`SIGNEDINFOTYPE_REFERENCE_E_ID`" unique="false"/>
+				<column name="`SIGNEDINFOTYPE_REFERENCE_ID`" unique="false"/>
 			</key>
 			<list-index column="`SIGNEDINFOTYPE_REFERENCE_IDX`"/>
 			<one-to-many entity-name="ReferenceType"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/NoCollectionOwnerAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/NoCollectionOwnerAction_hsqldb_e_o_hibernate.hbm.xml
index aa506e096..d30e1cc31 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/NoCollectionOwnerAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/NoCollectionOwnerAction_hsqldb_e_o_hibernate.hbm.xml
@@ -25,7 +25,7 @@
 			<column not-null="false" unique="false" name="`PRODUCT_PRODUCTCATEGORY_E_ID`"/>
 		</many-to-one>
 		<many-to-one name="priceCategory" entity-name="PriceCategory" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PRODUCT_PRICECATEGORY" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`PRICECATEGORY_PRICECATEGORY_E_ID`"/>
+			<column not-null="false" unique="false" name="`PRICECATEGORY_PRICECATEGORY_NAME`"/>
 		</many-to-one>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.issues.nocollectionowner.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`CUSTOMER`">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/NoCollectionOwnerAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/NoCollectionOwnerAction_hsqldb_h_o_hibernate.hbm.xml
index 0c7fe4c71..6b83eac69 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/NoCollectionOwnerAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/NoCollectionOwnerAction_hsqldb_h_o_hibernate.hbm.xml
@@ -28,7 +28,7 @@
 			<column not-null="false" unique="false" name="`PRODUCT_PRODUCTCATEGORY_E_ID`"/>
 		</many-to-one>
 		<many-to-one name="priceCategory" entity-name="PriceCategory" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PRODUCT_PRICECATEGORY" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`PRICECATEGORY_PRICECATEGORY_E_ID`"/>
+			<column not-null="false" unique="false" name="`PRICECATEGORY_PRICECATEGORY_NAME`"/>
 		</many-to-one>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.issues.nocollectionowner.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" discriminator-value="Customer" table="`CUSTOMER`">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_hsqldb_e_o_hibernate.hbm.xml
index 0e583cadf..54eff186e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_hsqldb_e_o_hibernate.hbm.xml
@@ -20,7 +20,7 @@
 			<one-to-many entity-name="CarWheel"/>
 		</list>
 		<many-to-one name="carLinkRef" entity-name="CarLink" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="CARFRAME_CARLINKREF" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`CARLINK_CARLINKREF_E_ID`"/>
+			<column not-null="false" unique="false" name="`CARLINK_CARLINKREF_CARLINKID`"/>
 		</many-to-one>
 		<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`"/>
@@ -85,7 +85,7 @@
 		</version>
 		<list name="carFrame" lazy="true" cascade="all,delete-orphan">
 			<key update="true" foreign-key="CARTYPE_CARFRAME">
-				<column name="`CARTYPE_CARFRAME_E_ID`" unique="false"/>
+				<column name="`CARTYPE_CARFRAME_CARID`" unique="false"/>
 			</key>
 			<list-index column="`CARTYPE_CARFRAME_IDX`"/>
 			<one-to-many entity-name="CarFrame"/>
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 0f8255ee5..a7b0b7048 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
@@ -23,7 +23,7 @@
 			<one-to-many entity-name="CarWheel"/>
 		</list>
 		<many-to-one name="carLinkRef" entity-name="CarLink" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="CARFRAME_CARLINKREF" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`CARLINK_CARLINKREF_E_ID`"/>
+			<column not-null="false" unique="false" name="`CARLINK_CARLINKREF_CARLINKID`"/>
 		</many-to-one>
 		<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`"/>
@@ -100,7 +100,7 @@
 		</version>
 		<list name="carFrame" lazy="true" cascade="all,delete-orphan">
 			<key update="true" foreign-key="CARTYPE_CARFRAME">
-				<column name="`CARTYPE_CARFRAME_E_ID`" unique="false"/>
+				<column name="`CARTYPE_CARFRAME_CARID`" unique="false"/>
 			</key>
 			<list-index column="`CARTYPE_CARFRAME_IDX`"/>
 			<one-to-many entity-name="CarFrame"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_hsqldb_e_o_hibernate.hbm.xml
index c96bc2a1e..29f26e551 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_hsqldb_e_o_hibernate.hbm.xml
@@ -106,14 +106,14 @@
 		</version>
 		<list name="library" lazy="true" cascade="all,delete-orphan">
 			<key update="true" foreign-key="LIBRARY_LIBRARY">
-				<column name="`LIBRARY_LIBRARY_E_ID`" unique="false"/>
+				<column name="`LIBRARY_LIBRARY_UNIQUENAME`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARY_LIBRARY_IDX`"/>
 			<one-to-many entity-name="Library"/>
 		</list>
 		<list name="abstractBookDefinitionGroup" table="`LIBRARY_ABSTRACTBOOKDEFINITIONGROUP`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
-				<column name="`LIBRARY_ABSTRACTBOOKDEFINITIONGROUP_E_ID`" unique="false"/>
+				<column name="`LIBRARY_ABSTRACTBOOKDEFINITIONGROUP_UNIQUENAME`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARY_ABSTRACTBOOKDEFINITIONGROUP_IDX`"/>
 			<one-to-many entity-name="Library_abstractBookDefinitionGroup"/>
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 a0d7d576b..31cc17554 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
@@ -109,14 +109,14 @@
 		</version>
 		<list name="library" lazy="true" cascade="all,delete-orphan">
 			<key update="true" foreign-key="LIBRARY_LIBRARY">
-				<column name="`LIBRARY_LIBRARY_E_ID`" unique="false"/>
+				<column name="`LIBRARY_LIBRARY_UNIQUENAME`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARY_LIBRARY_IDX`"/>
 			<one-to-many entity-name="Library"/>
 		</list>
 		<list name="abstractBookDefinitionGroup" table="`LIBRARY_ABSTRACTBOOKDEFINITIONGROUP`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
-				<column name="`LIBRARY_ABSTRACTBOOKDEFINITIONGROUP_E_ID`" unique="false"/>
+				<column name="`LIBRARY_ABSTRACTBOOKDEFINITIONGROUP_UNIQUENAME`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARY_ABSTRACTBOOKDEFINITIONGROUP_IDX`"/>
 			<one-to-many entity-name="Library_abstractBookDefinitionGroup"/>