diff --git a/transforms01/adl2hibernate.xslt b/transforms01/adl2hibernate.xslt
index f786d96..258392c 100755
--- a/transforms01/adl2hibernate.xslt
+++ b/transforms01/adl2hibernate.xslt
@@ -12,7 +12,7 @@
       Transform ADL to Hibernate
       
       $Author: sb $
-      $Revision: 1.6 $
+      $Revision: 1.7 $
   -->
 
   <!-- 
@@ -62,7 +62,7 @@
           *	THIS FILE IS AUTOMATICALLY GENERATED AND SHOULD NOT
           *	BE MANUALLY EDITED. 
           *
-          *	Generated using adl2hibernate-mapping.xsl revision <xsl:value-of select="substring('$Revision: 1.6 $', 12)"/>
+          *	Generated using adl2hibernate-mapping.xsl revision <xsl:value-of select="substring('$Revision: 1.7 $', 12)"/>
           *
           ***************************************************************************
         </xsl:comment>
@@ -109,6 +109,9 @@
       </xsl:when>
       <xsl:when test="count( adl:property) = 1">
         <id>
+          <xsl:attribute name="name">
+            <xsl:value-of select="adl:property[position()=1]/@name"/>
+          </xsl:attribute>
           <xsl:attribute name="column">
             <xsl:choose>
               <xsl:when test="adl:property[position()=1]/@column">
@@ -188,6 +191,16 @@
               <xsl:attribute name="name">
                 <xsl:value-of select="@name"/>
               </xsl:attribute>
+              <xsl:attribute name="column">
+                <xsl:choose>
+                  <xsl:when test="@column">
+                    <xsl:value-of select="@column"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:value-of select="@name"/>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </xsl:attribute>
               <xsl:attribute name="type">
                 <xsl:call-template name="csharp-type">
                   <xsl:with-param name="property" select="."/>
@@ -201,6 +214,16 @@
               <xsl:attribute name="name">
                 <xsl:value-of select="@name"/>
               </xsl:attribute>
+              <xsl:attribute name="column">
+                <xsl:choose>
+                  <xsl:when test="@column">
+                    <xsl:value-of select="@column"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:value-of select="@name"/>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </xsl:attribute>
               <xsl:attribute name="class">
                 <xsl:value-of select="@entity"/>
               </xsl:attribute>