diff --git a/transforms/adl2controllerclasses.xslt b/transforms/adl2controllerclasses.xslt
index 21d5ce4..affb202 100755
--- a/transforms/adl2controllerclasses.xslt
+++ b/transforms/adl2controllerclasses.xslt
@@ -9,8 +9,8 @@
     Transform ADL into (partial) controller classes
     
     $Author: af $
-    $Revision: 1.1 $
-    $Date: 2008-01-21 16:38:31 $
+    $Revision: 1.2 $
+    $Date: 2008-01-31 12:34:21 $
   -->
 
   <!-- WARNING WARNING WARNING: Do NOT reformat this file! 
@@ -50,7 +50,7 @@
     with the revision number of the generated file if the generated file is 
     stored to CVS -->
       <xsl:variable name="transform-rev1"
-                    select="substring( '$Revision: 1.1 $', 11)"/>
+                    select="substring( '$Revision: 1.2 $', 11)"/>
       <xsl:variable name="transform-revision"
                     select="substring( $transform-rev1, 0, string-length( $transform-rev1) - 1)"/>
 
@@ -87,7 +87,7 @@ using NHibernate;
 using NHibernate.Expression;
 using Castle.MonoRail.Framework;
 using Cygnet.Entities;
-using Cygnet.Entities.Exceptions;
+using Cygnet.Exceptions;
 using Iesi.Collections.Generic;
 using <xsl:value-of select="$entityns" />; 
 
diff --git a/transforms/adl2entityclasses.xslt b/transforms/adl2entityclasses.xslt
index f7db1a0..2c92ec8 100755
--- a/transforms/adl2entityclasses.xslt
+++ b/transforms/adl2entityclasses.xslt
@@ -8,8 +8,8 @@
     Transform ADL into entity classes
     
     $Author: af $
-    $Revision: 1.1 $
-    $Date: 2008-01-21 16:38:31 $
+    $Revision: 1.2 $
+    $Date: 2008-01-31 12:34:21 $
   -->
 
   <!-- WARNING WARNING WARNING: Do NOT reformat this file! 
@@ -48,7 +48,7 @@
     stored to CVS -->
 
     <xsl:variable name="transform-rev1"
-                  select="substring( '$Revision: 1.1 $', 11)"/>
+                  select="substring( '$Revision: 1.2 $', 11)"/>
     <xsl:variable name="transform-revision"
                   select="substring( $transform-rev1, 0, string-length( $transform-rev1) - 1)"/>
 
@@ -76,7 +76,7 @@
     using System.Text;
     using System.Text.RegularExpressions;
     using Cygnet.Entities;
-    using Cygnet.Entities.Exceptions;
+    using Cygnet.Exceptions;
     using Iesi.Collections.Generic;
 
     /// &lt;summary&gt;
@@ -237,7 +237,7 @@
       if ( value == null)
       {
       throw new DataRequiredException( <xsl:choose>
-        <xsl:when test="ifmissing[@locale=$locale]">
+        <xsl:when test="ifmissing[@locale=$lang]">
           <xsl:apply-templates select="ifmissing"/>
         </xsl:when>
         <xsl:otherwise>