diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/ResolverExtension.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/ResolverExtension.java
index 9e1fede..940c00a 100644
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/ResolverExtension.java
+++ b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/ResolverExtension.java
@@ -47,7 +47,7 @@
 {
 	private static final Double DEFAULT_XSLT_VERSION = 1.0;
 	private static final String XSLT_STYLESHEET = "stylesheet"; //$NON-NLS-1$
-	private static final String XSLT_TEMPLATE = "template"; //$NON-NLS-1$
+	private static final String XSLT_TRANSFORM = "transform"; //$NON-NLS-1$
 	private static final String XSLT_VERSION = "version"; //$NON-NLS-1$
 
 	private boolean initialised;
@@ -174,7 +174,7 @@
 					if (doc != null && doc.getDocumentElement() != null)
 					{
 						Element documentElement = doc.getDocumentElement();
-						if (XSLT_STYLESHEET.equals(documentElement.getLocalName()) || XSLT_TEMPLATE.equals(documentElement.getLocalName()))
+						if (XSLT_STYLESHEET.equals(documentElement.getLocalName()) || XSLT_TRANSFORM.equals(documentElement.getLocalName()))
 						{
 							return documentElement.getAttribute(XSLT_VERSION);
 						}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/XSLVersionHandler.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/XSLVersionHandler.java
index 99178e1..86844b3 100644
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/XSLVersionHandler.java
+++ b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/XSLVersionHandler.java
@@ -30,7 +30,7 @@
 
 	private static final String XSLT_STYLESHEET = "stylesheet"; //$NON-NLS-1$
 
-	private static final String XSLT_TEMPLATE = "template"; //$NON-NLS-1$
+	private static final String XSLT_TRANSFORM = "transform"; //$NON-NLS-1$
 
 	private static final String XSLT_VERSION = "version"; //$NON-NLS-1$
 
@@ -192,7 +192,7 @@
 	 */
 	@Override
 	public final void startElement(final String uri, final String elementName, final String qualifiedName, final Attributes attributes) throws SAXException {
-		if (uri.equals(XSLCore.XSL_NAMESPACE_URI) && (XSLT_TEMPLATE.equals(elementName) || XSLT_STYLESHEET.equals(elementName))) {
+		if (uri.equals(XSLCore.XSL_NAMESPACE_URI) && (XSLT_TRANSFORM.equals(elementName) || XSLT_STYLESHEET.equals(elementName))) {
 			versionAttribute = attributes.getValue(XSLT_VERSION);
 		} else {
 			versionAttribute = ""; //$NON-NLS-1$
