diff --git a/tools.descartes.dni.adaptation/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java b/tools.descartes.dni.adaptation/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java
index 967e92c4b3bb18372dfa232368b37605e04b9b25..4a5a20dbe58b8f9eb7b06ae4f7b1a3c9b0375fe6 100644
--- a/tools.descartes.dni.adaptation/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java
+++ b/tools.descartes.dni.adaptation/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java
@@ -12,21 +12,21 @@ import org.junit.Test;
 import tools.descartes.dni.dnimm3ap.AdaptationPoints;
 import tools.descartes.dni.dnimm3ap.impl.AdaptationPointsImpl;
 import tools.descartes.dni.dnimm3ap.impl.DNIAPFactoryImpl;
-import tools.descartes.dni.dnimm3ap.tools.Parser;
+import tools.descartes.dni.dnimm3ap.tools.DniApParser;
 
 public class ParserTest {
 
 	@Test
 	public void shouldConvertFileToModel() {
 		File file = new File("resources-test/scenario0B.dniap");
-		AdaptationPointsImpl adaptationPoints = Parser.convertToModel(file);
+		AdaptationPointsImpl adaptationPoints = DniApParser.convertToModel(file);
 		Assert.assertTrue(adaptationPoints.getRepositories().getNodes().size() > 0);
 	}
 
 	@Test
 	public void shouldConvertFileToModelWithNetworkStructure() {
 		File file = new File("resources-test/scenario0B.dniap");
-		AdaptationPointsImpl adaptationPoints = Parser.convertToModel(file);
+		AdaptationPointsImpl adaptationPoints = DniApParser.convertToModel(file);
 		Assert.assertEquals(6, adaptationPoints.getNetworkInfrastructure().getStructure().getNodes().size());
 	}
 
@@ -36,7 +36,7 @@ public class ParserTest {
 		AdaptationPoints model = factory.createAdaptationPoints();
 		File file = File.createTempFile("junit-dni-", ".dniap");
 		file.deleteOnExit();
-		Parser.writeToFile(model, file);
+		DniApParser.writeToFile(model, file);
 		Assert.assertTrue(file.length() > 100);
 	}
 
@@ -44,7 +44,7 @@ public class ParserTest {
 	public void shouldConvertModelToByteArray() throws IOException {
 		DNIAPFactoryImpl factory = new DNIAPFactoryImpl();
 		AdaptationPoints model = factory.createAdaptationPoints();
-		byte[] bytes = Parser.convertToByteArray(model);
+		byte[] bytes = DniApParser.convertToByteArray(model);
 		Assert.assertTrue(bytes.length > 10);
 	}
 
@@ -52,7 +52,7 @@ public class ParserTest {
 	public void shouldConvertByteArrayToModel() throws IOException {
 		Path path = Paths.get("resources-test/scenario0B.dniap");
 		byte[] data = Files.readAllBytes(path);
-		AdaptationPoints adaptationPoints = Parser.convertToModel(data);
+		AdaptationPoints adaptationPoints = DniApParser.convertToModel(data);
 		Assert.assertTrue(adaptationPoints.getRepositories().getNodes().size() > 0);
 	}
 
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/tools/Parser.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/tools/DniApParser.java
similarity index 99%
rename from tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/tools/Parser.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/tools/DniApParser.java
index 977301090b4c42c4e0e5a14f604c8d3162b6249e..b1522520958f7041222f64d2d835be9cde93aef9 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/tools/Parser.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/tools/DniApParser.java
@@ -16,7 +16,7 @@ import tools.descartes.dni.dnimm3ap.AdaptationPoints;
 import tools.descartes.dni.dnimm3ap.DNIAPPackage;
 import tools.descartes.dni.dnimm3ap.impl.AdaptationPointsImpl;
 
-public class Parser {
+public class DniApParser {
 
 	public static AdaptationPointsImpl convertToModel(File file) {
 		ResourceSet resourceSet = new ResourceSetImpl();
diff --git a/tools.descartes.dni.core/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java b/tools.descartes.dni.core/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java
index 01cadfd7cc20c115148450c75972244debc69636..2844ddeab7f276cb441c236f131091e8bfb1170e 100644
--- a/tools.descartes.dni.core/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java
+++ b/tools.descartes.dni.core/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java
@@ -18,14 +18,14 @@ public class ParserTest {
 	@Test
 	public void shouldConvertFileToModel() {
 		File file = new File("resources-test/scenario0A.dni");
-		NetworkInfrastructureImpl networkInfrastructure = Parser.convertToModel(file);
+		NetworkInfrastructureImpl networkInfrastructure = DniParser.convertToModel(file);
 		Assert.assertEquals(6, networkInfrastructure.getStructure().getNodes().size());
 	}
 
 	@Test
 	public void shouldConvertFileWithAdaptationToModel() {
 		File file = new File("resources-test/scenario0B.dni");
-		NetworkInfrastructureImpl networkInfrastructure = Parser.convertToModel(file);
+		NetworkInfrastructureImpl networkInfrastructure = DniParser.convertToModel(file);
 		Assert.assertEquals(6, networkInfrastructure.getStructure().getNodes().size());
 	}
 
@@ -35,7 +35,7 @@ public class ParserTest {
 		NetworkInfrastructure model = factory.createNetworkInfrastructure();
 		File file = File.createTempFile("junit-dni-", ".dni");
 		file.deleteOnExit();
-		Parser.writeToFile(model, file);
+		DniParser.writeToFile(model, file);
 		Assert.assertTrue(file.length() > 100);
 	}
 
@@ -43,7 +43,7 @@ public class ParserTest {
 	public void shouldConvertModelToByteArray() throws IOException {
 		DNIFactoryImpl factory = new DNIFactoryImpl();
 		NetworkInfrastructure model = factory.createNetworkInfrastructure();
-		byte[] bytes = Parser.convertToByteArray(model);
+		byte[] bytes = DniParser.convertToByteArray(model);
 		Assert.assertTrue(bytes.length > 100);
 	}
 
@@ -51,7 +51,7 @@ public class ParserTest {
 	public void shouldConvertByteArrayToModel() throws IOException {
 		Path path = Paths.get("resources-test/scenario0A.dni");
 		byte[] data = Files.readAllBytes(path);
-		NetworkInfrastructureImpl networkInfrastructure = Parser.convertToModel(data);
+		NetworkInfrastructureImpl networkInfrastructure = DniParser.convertToModel(data);
 		Assert.assertEquals(6, networkInfrastructure.getStructure().getNodes().size());
 	}
 
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/tools/Parser.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/tools/DniParser.java
similarity index 99%
rename from tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/tools/Parser.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/tools/DniParser.java
index efe1fa7916b902cb8e0ddc367328911ee88c38a5..510d2ba6802050eb27f8e9ae0561d2b7046929af 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/tools/Parser.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/tools/DniParser.java
@@ -16,7 +16,7 @@ import tools.descartes.dni.dnimm3.DNIPackage;
 import tools.descartes.dni.dnimm3.NetworkInfrastructure;
 import tools.descartes.dni.dnimm3.impl.NetworkInfrastructureImpl;
 
-public class Parser {
+public class DniParser {
 
 	public static NetworkInfrastructureImpl convertToModel(File file) {
 		ResourceSet resourceSet = new ResourceSetImpl();