Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r9771e3b0f4bd5fa446d2c7b19604a958c1fb3aaa -rf0b1688e337075cd06a3b830e45ddd51d6ba4fe0
Binary files differ
Index: lams_central/web/toolcontent/learning-design-ims.xslt
===================================================================
diff -u -r13f0dddac4d08db5b537bfa8d8d8fd91e25c9fe9 -rf0b1688e337075cd06a3b830e45ddd51d6ba4fe0
--- lams_central/web/toolcontent/learning-design-ims.xslt	(.../learning-design-ims.xslt)	(revision 13f0dddac4d08db5b537bfa8d8d8fd91e25c9fe9)
+++ lams_central/web/toolcontent/learning-design-ims.xslt	(.../learning-design-ims.xslt)	(revision f0b1688e337075cd06a3b830e45ddd51d6ba4fe0)
@@ -19,7 +19,7 @@
 
   http://www.gnu.org/licenses/gpl.txt 
 -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:lams="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0"  xmlns="http://www.imsglobal.org/xsd/imscp_v1p1" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:lams="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0.xsd"  xmlns="http://www.imsglobal.org/xsd/imscp_v1p1" version="1.0">
 	<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
 	<xsl:param name="lamsLanguage"/>
 	<xsl:param name="resourcesFile"/>
@@ -31,7 +31,7 @@
 				<schemaversion>1.2</schemaversion>
 			</metadata>
 			<organizations default="default">
-				<learning-design identifier="default" uri="" level="A" xmlns="http://www.imsglobal.org/xsd/imsld_v1p0" xmlns:lams="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0">
+				<learning-design identifier="default" uri="" level="A" xmlns="http://www.imsglobal.org/xsd/imsld_v1p0" xmlns:lams="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0.xsd">
 					<title>
 						<lams:langstring>
 							<xsl:value-of select="*/title"/>
@@ -40,7 +40,7 @@
 					<!-- ================================== lams LD ================================== -->
 					<xsl:for-each select="/*/*">
 						<xsl:if test="(count(ancestor::*) =1) and (name(.) !='activities') and (name(.) != 'transitions')">
-								<xsl:element name="lams:{local-name()}" namespace="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0"><xsl:copy-of select="@*"/><xsl:value-of select="."/></xsl:element>
+								<xsl:element name="lams:{local-name()}" namespace="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0.xsd"><xsl:copy-of select="@*"/><xsl:value-of select="."/></xsl:element>
 						</xsl:if>
 					</xsl:for-each>
 
@@ -120,7 +120,7 @@
 			</complete-activity>
 			<lams:lams-tool-activity>
 				<xsl:for-each select="node() | @*">
-					<xsl:element name="lams:{local-name()}" namespace="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0"><xsl:copy-of select="@*"/><xsl:value-of select="."/></xsl:element>
+					<xsl:element name="lams:{local-name()}" namespace="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0.xsd"><xsl:copy-of select="@*"/><xsl:value-of select="."/></xsl:element>
 				</xsl:for-each>
 			</lams:lams-tool-activity>
 		</learning-activity>
@@ -137,7 +137,7 @@
 			</complete-activity>
 			<lams:lams-tool-activity>
 				<xsl:for-each select="node() | @*">
-					<xsl:element name="lams:{local-name()}" namespace="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0"><xsl:copy-of select="@*"/><xsl:value-of select="."/></xsl:element>
+					<xsl:element name="lams:{local-name()}" namespace="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0.xsd"><xsl:copy-of select="@*"/><xsl:value-of select="."/></xsl:element>
 				</xsl:for-each>
 			</lams:lams-tool-activity>
 		</learning-activity>
@@ -154,7 +154,7 @@
 			</complete-activity>
 			<lams:lams-tool-activity>
 				<xsl:for-each select="node() | @*">
-					<xsl:element name="lams:{local-name()}" namespace="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0"><xsl:copy-of select="@*"/><xsl:value-of select="."/></xsl:element>
+					<xsl:element name="lams:{local-name()}" namespace="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0.xsd"><xsl:copy-of select="@*"/><xsl:value-of select="."/></xsl:element>
 				</xsl:for-each>
 			</lams:lams-tool-activity>
 		</learning-activity>
@@ -182,7 +182,7 @@
 			</xsl:for-each>
 			<lams:lams-complex-activity>
 				<xsl:for-each select="node() | @*">
-					<xsl:element name="lams:{local-name()}" namespace="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0"><xsl:copy-of select="@*"/><xsl:value-of select="."/></xsl:element>
+					<xsl:element name="lams:{local-name()}" namespace="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0.xsd"><xsl:copy-of select="@*"/><xsl:value-of select="."/></xsl:element>
 				</xsl:for-each>
 			</lams:lams-complex-activity>
 		</activity-structure>
@@ -202,7 +202,7 @@
 	<xsl:template match="org.lamsfoundation.lams.learningdesign.dto.TransitionDTO">
 		<lams:transition>
 			<xsl:for-each select="node() | @*">
-				<xsl:element name="lams:{local-name()}" namespace="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0"><xsl:copy-of select="@*"/><xsl:value-of select="."/></xsl:element>
+				<xsl:element name="lams:{local-name()}" namespace="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0.xsd"><xsl:copy-of select="@*"/><xsl:value-of select="."/></xsl:element>
 			</xsl:for-each>
 		</lams:transition>
 		<xsl:apply-templates select="org.lamsfoundation.lams.learningdesign.dto.TransitionDTO"/>
@@ -226,7 +226,7 @@
 					<xsl:value-of select="activityTitle"/>
 				</title>
 				<service  xsl:use-attribute-sets="serviceAttr">
-					<tool_interface xmlns="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0">
+					<tool_interface xmlns="http://www.lamsfoundation.org/xsd/lams_ims_export_v1p0.xsd">
 						<tool_id>
 							<identifier type="URN">URN:LAMS:<xsl:value-of select="toolSignature"/>-<xsl:value-of select="toolContentID"/></identifier>
 						</tool_id>
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
diff -u -r13f0dddac4d08db5b537bfa8d8d8fd91e25c9fe9 -rf0b1688e337075cd06a3b830e45ddd51d6ba4fe0
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision 13f0dddac4d08db5b537bfa8d8d8fd91e25c9fe9)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision f0b1688e337075cd06a3b830e45ddd51d6ba4fe0)
@@ -749,7 +749,7 @@
 						//cache DTO object class and transform it into a tag : for later import use by XStream.
 						String mainObject = root.getName();
 						root.setName(activity.getToolSignature());
-						Namespace ns = Namespace.getNamespace(IMS_TOOL_NS_PREFIX+activity.getToolSignature()+"_ims_" + activity.getToolVersion() + ".xsd");
+						Namespace ns = Namespace.getNamespace(IMS_TOOL_NS_PREFIX+activity.getToolSignature()+"_ims.xsd");
 						root.setNamespace(ns);
 						
 						//add mainObject tag: it save the Tool DTO class name. It is useful when importing by XStream (perhaps a future function)