diff --git a/Task_B/src/main/MyBuildConfigReaderFactory.java b/Task_B/src/main/BuildConfigReaderFactory.java
similarity index 60%
rename from Task_B/src/main/MyBuildConfigReaderFactory.java
rename to Task_B/src/main/BuildConfigReaderFactory.java
index 5dddcd888a57aaccd5450d8f595919175f536b05..0743b43ac9b4a9103d7f190f2d05d67199974e51 100644
--- a/Task_B/src/main/MyBuildConfigReaderFactory.java
+++ b/Task_B/src/main/BuildConfigReaderFactory.java
@@ -3,16 +3,16 @@ package main;
 import xml.XMLBuildConfigurationReader;
 import yaml.YamlBuildConfigurationReader;
 
-public class MyBuildConfigReaderFactory implements IBuildConfigReaderFactory {
+public class BuildConfigReaderFactory implements IBuildConfigReaderFactory {
 
 	@Override
 	public IBuildConfigReader createBuildConfigReader(String buildFileName) {
 		String fileNameExtension = buildFileName.substring(buildFileName.lastIndexOf("."));
 		if (fileNameExtension.equals(".yaml")) {
-			return new MyYamlBuildConfigReader(new YamlBuildConfigurationReader(buildFileName));
+			return new YamlBuildConfigReaderAdapter(new YamlBuildConfigurationReader(buildFileName));
 			
 		} else if (fileNameExtension.equals(".xml")) {
-			return new MyXMLBuildConfigReader(new XMLBuildConfigurationReader(buildFileName));
+			return new XMLBuildConfigReaderAdapter(new XMLBuildConfigurationReader(buildFileName));
 			
 		} else {
 			return null;
diff --git a/Task_B/src/main/MyBuildFactory.java b/Task_B/src/main/BuildFactory.java
similarity index 66%
rename from Task_B/src/main/MyBuildFactory.java
rename to Task_B/src/main/BuildFactory.java
index 4d301e76ebf52466bcea22ce600d50bc95b880fe..8c8855c9f609acd3e999f0ee50cb5c968d295a70 100644
--- a/Task_B/src/main/MyBuildFactory.java
+++ b/Task_B/src/main/BuildFactory.java
@@ -4,16 +4,16 @@ import domain.BuildConfig;
 import xml.Build;
 import yaml.Compile;
 
-public class MyBuildFactory implements IBuildFactory {
+public class BuildFactory implements IBuildFactory {
 
 	@Override
 	public IBuild createBuild(String buildFileName, BuildConfig buildConfig, String targetName) {
 		String fileNameExtension = buildFileName.substring(buildFileName.lastIndexOf("."));
 		if (fileNameExtension.equals(".yaml")) {
-			return new MyYamlBuild(new Compile(buildConfig, targetName));
+			return new YamlBuildAdapter(new Compile(buildConfig, targetName));
 			
 		} else if (fileNameExtension.equals(".xml")) {
-			return new MyXMLBuild(new Build(buildConfig.getProject()), targetName);
+			return new XMLBuildAdapter(new Build(buildConfig.getProject()), targetName);
 			
 		} else {
 			return null;
diff --git a/Task_B/src/main/IBuild.java b/Task_B/src/main/IBuild.java
index 434f5f87bfb1e584830bb1fd674aa806e83f8c02..4da4f5de0eeadc0a53e4b8972c40267063780751 100644
--- a/Task_B/src/main/IBuild.java
+++ b/Task_B/src/main/IBuild.java
@@ -1,7 +1,5 @@
 package main;
 
-import domain.BuildConfig;
-
 public interface IBuild {
 	public void build(int debuglevel);
 }
diff --git a/Task_B/src/main/Main.java b/Task_B/src/main/Main.java
index 8e4c885d643fe52aac955f8aad67c58629cdb0be..a866f8e871df07b0c4f081c0270f308a85b69bbb 100755
--- a/Task_B/src/main/Main.java
+++ b/Task_B/src/main/Main.java
@@ -26,10 +26,10 @@ public class Main {
 	}
 	
 	private static void buildTarget(String buildFileName, String target) {
-		MyBuildConfigReaderFactory buildConfigReaderFactory = new MyBuildConfigReaderFactory();
+		BuildConfigReaderFactory buildConfigReaderFactory = new BuildConfigReaderFactory();
 		IBuildConfigReader buildConfigReader = buildConfigReaderFactory.createBuildConfigReader(buildFileName);
 		BuildConfig buildConfig = buildConfigReader.getBuildConfig();
-		MyBuildFactory builderFactory = new MyBuildFactory();
+		BuildFactory builderFactory = new BuildFactory();
 		IBuild build = builderFactory.createBuild(buildFileName, buildConfig, target);
 		build.build(1);
 	}
diff --git a/Task_B/src/main/MyXMLBuild.java b/Task_B/src/main/XMLBuildAdapter.java
similarity index 66%
rename from Task_B/src/main/MyXMLBuild.java
rename to Task_B/src/main/XMLBuildAdapter.java
index 8d094a540fd5dced5d6e69709d5098b7bd6335ae..43aab2a7c7818255f0c655303af2831de5708b0a 100644
--- a/Task_B/src/main/MyXMLBuild.java
+++ b/Task_B/src/main/XMLBuildAdapter.java
@@ -2,12 +2,12 @@ package main;
 
 import xml.Build;
 
-public class MyXMLBuild implements IBuild {
+public class XMLBuildAdapter implements IBuild {
 	
 	Build adaptee;
 	String targetName;
 	
-	public MyXMLBuild(Build xmlBuild, String targetName) {
+	public XMLBuildAdapter(Build xmlBuild, String targetName) {
 		adaptee = xmlBuild;
 		this.targetName = targetName;
 	}
diff --git a/Task_B/src/main/MyXMLBuildConfigReader.java b/Task_B/src/main/XMLBuildConfigReaderAdapter.java
similarity index 68%
rename from Task_B/src/main/MyXMLBuildConfigReader.java
rename to Task_B/src/main/XMLBuildConfigReaderAdapter.java
index 4aad5be985c77bfd4b7362bf3dd7e8e2d5e2c11d..77672850d4f16294fc716f0ed43d9c76f8195014 100644
--- a/Task_B/src/main/MyXMLBuildConfigReader.java
+++ b/Task_B/src/main/XMLBuildConfigReaderAdapter.java
@@ -3,11 +3,11 @@ package main;
 import domain.BuildConfig;
 import xml.XMLBuildConfigurationReader;
 
-public class MyXMLBuildConfigReader implements IBuildConfigReader {
+public class XMLBuildConfigReaderAdapter implements IBuildConfigReader {
 
 	private XMLBuildConfigurationReader adaptee;
 
-	public MyXMLBuildConfigReader(XMLBuildConfigurationReader buildConfigReader) {
+	public XMLBuildConfigReaderAdapter(XMLBuildConfigurationReader buildConfigReader) {
 		adaptee = buildConfigReader;
 	}
 	
diff --git a/Task_B/src/main/MyYamlBuild.java b/Task_B/src/main/YamlBuildAdapter.java
similarity index 62%
rename from Task_B/src/main/MyYamlBuild.java
rename to Task_B/src/main/YamlBuildAdapter.java
index 7e1027b6f3c68c99f9445f846c368768e45aae71..6791b861ed579e0ab5bba5f1669ce903d5fd3aa4 100644
--- a/Task_B/src/main/MyYamlBuild.java
+++ b/Task_B/src/main/YamlBuildAdapter.java
@@ -2,11 +2,11 @@ package main;
 
 import yaml.Compile;
 
-public class MyYamlBuild implements IBuild {
+public class YamlBuildAdapter implements IBuild {
 	
 	Compile adaptee;
 	
-	public MyYamlBuild(Compile yamlCompile) {
+	public YamlBuildAdapter(Compile yamlCompile) {
 		adaptee = yamlCompile;
 	}
 
diff --git a/Task_B/src/main/MyYamlBuildConfigReader.java b/Task_B/src/main/YamlBuildConfigReaderAdapter.java
similarity index 62%
rename from Task_B/src/main/MyYamlBuildConfigReader.java
rename to Task_B/src/main/YamlBuildConfigReaderAdapter.java
index 9e4d4fd8c5460806e00c446e9857de6365808ee8..638bf58729cfe9179ceafedf2b77679a3c5d362d 100644
--- a/Task_B/src/main/MyYamlBuildConfigReader.java
+++ b/Task_B/src/main/YamlBuildConfigReaderAdapter.java
@@ -3,11 +3,11 @@ package main;
 import domain.BuildConfig;
 import yaml.YamlBuildConfigurationReader;
 
-public class MyYamlBuildConfigReader implements IBuildConfigReader {
+public class YamlBuildConfigReaderAdapter implements IBuildConfigReader {
 	
 	private YamlBuildConfigurationReader adaptee;
 
-	public MyYamlBuildConfigReader(YamlBuildConfigurationReader buildConfigReader) {
+	public YamlBuildConfigReaderAdapter(YamlBuildConfigurationReader buildConfigReader) {
 		adaptee = buildConfigReader;
 	}