diff --git a/wise-webapp/src/main/resources/com/wisemapping/model/AccessAuditory.hbm.xml b/wise-webapp/src/main/resources/com/wisemapping/model/AccessAuditory.hbm.xml
index 8586119d..ca0a1e12 100755
--- a/wise-webapp/src/main/resources/com/wisemapping/model/AccessAuditory.hbm.xml
+++ b/wise-webapp/src/main/resources/com/wisemapping/model/AccessAuditory.hbm.xml
@@ -11,7 +11,7 @@
         </id>
         <property name="loginDate" column="login_Date"/>
         <many-to-one name="user"
-                     column="USER_ID"
+                     column="user_id"
                      not-null="true"
                      class="com.wisemapping.model.User"
                 />
diff --git a/wise-webapp/src/main/resources/com/wisemapping/model/Collaboration.hbm.xml b/wise-webapp/src/main/resources/com/wisemapping/model/Collaboration.hbm.xml
index 51808281..7c0f0cc4 100644
--- a/wise-webapp/src/main/resources/com/wisemapping/model/Collaboration.hbm.xml
+++ b/wise-webapp/src/main/resources/com/wisemapping/model/Collaboration.hbm.xml
@@ -10,17 +10,17 @@
             <generator class="increment"/>
         </id>
 
-        <property name="roleId" column="ROLE_ID" unique="true" not-null="true"/>
+        <property name="roleId" column="role_id" unique="true" not-null="true"/>
 
         <!-- Read-only association property -->
         <many-to-one name="mindMap"
-                     column="MINDMAP_ID"
+                     column="mindmap_id"
                      not-null="true"
                      class="com.wisemapping.model.Mindmap"
                 />
 
         <many-to-one name="collaborator"
-                     column="COLABORATOR_ID"
+                     column="colaborator_id"
                      not-null="true"
                      class="com.wisemapping.model.Collaborator"
                 />
diff --git a/wise-webapp/src/main/resources/com/wisemapping/model/Collaborator.hbm.xml b/wise-webapp/src/main/resources/com/wisemapping/model/Collaborator.hbm.xml
index ef094032..77cbdb99 100755
--- a/wise-webapp/src/main/resources/com/wisemapping/model/Collaborator.hbm.xml
+++ b/wise-webapp/src/main/resources/com/wisemapping/model/Collaborator.hbm.xml
@@ -15,12 +15,12 @@
         <set name="collaborations"
              cascade="all, delete-orphan"
              inverse="true">
-            <key column="COLABORATOR_ID" not-null="true"/>
+            <key column="colaborator_id" not-null="true"/>
             <one-to-many class="com.wisemapping.model.Collaboration"/>
         </set>
 
         <joined-subclass name="com.wisemapping.model.User" table="USER">
-            <key column="COLABORATOR_ID"/>
+            <key column="colaborator_id"/>
             <property name="firstname"/>
             <property name="lastname"/>
             <property name="password"/>
diff --git a/wise-webapp/src/main/resources/com/wisemapping/model/MindMapHistory.hbm.xml b/wise-webapp/src/main/resources/com/wisemapping/model/MindMapHistory.hbm.xml
index e1320af4..29e9e836 100755
--- a/wise-webapp/src/main/resources/com/wisemapping/model/MindMapHistory.hbm.xml
+++ b/wise-webapp/src/main/resources/com/wisemapping/model/MindMapHistory.hbm.xml
@@ -11,7 +11,7 @@
         </id>
 
         <property name="mindmapId" column="mindmap_id"/>
-        <property name="xml" column="XML"/>
+        <property name="xml" column="xml"/>
         <property name="creationTime" column="creation_date"/>
         <many-to-one name="editor" column="editor_id" unique="false" not-null="false" lazy="proxy"/>
     </class>
diff --git a/wise-webapp/src/main/resources/com/wisemapping/model/Mindmap.hbm.xml b/wise-webapp/src/main/resources/com/wisemapping/model/Mindmap.hbm.xml
index 823a0725..31896561 100644
--- a/wise-webapp/src/main/resources/com/wisemapping/model/Mindmap.hbm.xml
+++ b/wise-webapp/src/main/resources/com/wisemapping/model/Mindmap.hbm.xml
@@ -22,7 +22,7 @@
         <set name="collaborations"
              cascade="all,delete-orphan,save-update"
              inverse="true">
-            <key column="MINDMAP_ID" not-null="true"/>
+            <key column="mindmap_id" not-null="true"/>
             <one-to-many class="com.wisemapping.model.Collaboration"/>
         </set>
     </class>