diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java
index e7e75cef45..17aa23a588 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java
@@ -45,7 +45,7 @@ import org.hibernate.jpamodelgen.model.MetaEntity;
 import org.hibernate.jpamodelgen.util.Constants;
 import org.hibernate.jpamodelgen.util.StringUtil;
 import org.hibernate.jpamodelgen.util.TypeUtils;
-import org.hibernate.jpamodelgen.xml.XmlParser;
+import org.hibernate.jpamodelgen.xml.JpaDescriptorParser;
 
 /**
  * Main annotation processor.
@@ -106,7 +106,7 @@ public class JPAMetaModelEntityProcessor extends AbstractProcessor {
 		boolean fullyAnnotationConfigured = Boolean.parseBoolean( tmp );
 
 		if ( !fullyAnnotationConfigured ) {
-			XmlParser parser = new XmlParser( context );
+			JpaDescriptorParser parser = new JpaDescriptorParser( context );
 			parser.parseXml();
 			if ( context.isPersistenceUnitCompletelyXmlConfigured() ) {
 				createMetaModelClasses();
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlParser.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/JpaDescriptorParser.java
similarity index 99%
rename from tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlParser.java
rename to tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/JpaDescriptorParser.java
index 9372082842..c3d4bb41da 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlParser.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/JpaDescriptorParser.java
@@ -51,7 +51,7 @@ import org.hibernate.jpamodelgen.xml.jaxb.PersistenceUnitMetadata;
 /**
  * @author Hardy Ferentschik
  */
-public class XmlParser {
+public class JpaDescriptorParser {
 	private static final String DEFAULT_ORM_XML_LOCATION = "/META-INF/orm.xml";
 	private static final String SERIALIZATION_FILE_NAME = "Hibernate-Static-Metamodel-Generator.tmp";
 
@@ -62,7 +62,7 @@ public class XmlParser {
 	private final List<EntityMappings> entityMappings;
 	private final XmlParserHelper xmlParserHelper;
 
-	public XmlParser(Context context) {
+	public JpaDescriptorParser(Context context) {
 		this.context = context;
 		this.entityMappings = new ArrayList<EntityMappings>();
 		this.xmlParserHelper = new XmlParserHelper( context );