diff --git a/scripts/TouchinBuild/Core/StepsRunner.py b/scripts/TouchinBuild/Core/StepsRunner.py
index 4e5894b..7441b89 100644
--- a/scripts/TouchinBuild/Core/StepsRunner.py
+++ b/scripts/TouchinBuild/Core/StepsRunner.py
@@ -33,7 +33,9 @@ class StepsRunner:
 		self.patchInfoPlistArray = PatchInfoPlistArrayCommandBuilder()
 		self.copyBuilder = CopyCommandBuilder()
 		self.testflightBuilder = TestflightCommandBuilder()
-		self.installProfileBuilder = InstallProfileCommandBuilder()
+
+		profilePrefix = config['project_name']
+		self.installProfileBuilder = InstallProfileCommandBuilder(profilePrefix)
 
 		buildUtilPath = config['build_tool']
 		self.cleanBuilder = CleanBuildCommandBuilder(buildUtilPath, 'clean')
diff --git a/scripts/TouchinBuild/Tests/ManualTests/install_profile.py b/scripts/TouchinBuild/Tests/ManualTests/install_profile.py
index 1f588f6..e86e39c 100644
--- a/scripts/TouchinBuild/Tests/ManualTests/install_profile.py
+++ b/scripts/TouchinBuild/Tests/ManualTests/install_profile.py
@@ -2,7 +2,7 @@ from CommandBuilders.InstallProfileCommandBuilder import InstallProfileCommandBu
 
 line = "install profile 'BuildSample/BuildSample/Profiles/8F606DAE-F9C9-4A19-8EFF-34B990D76C28.mobileprovision'"
 
-builder = InstallProfileCommandBuilder()
+builder = InstallProfileCommandBuilder('BsProject')
 command = builder.getCommandFor(line)
 
 command.execute()
\ No newline at end of file
diff --git a/scripts/TouchinBuild/Tests/UnitTests/InstallProfile/test_installProfileBuilder.py b/scripts/TouchinBuild/Tests/UnitTests/InstallProfile/test_installProfileBuilder.py
index 13c5656..063374a 100644
--- a/scripts/TouchinBuild/Tests/UnitTests/InstallProfile/test_installProfileBuilder.py
+++ b/scripts/TouchinBuild/Tests/UnitTests/InstallProfile/test_installProfileBuilder.py
@@ -13,4 +13,4 @@ class TestInstallProfileBuilder(unittest.TestCase):
 
 	def test_dstPath(self):
 		dstPath = self.builder.getDestinationPath('/Some/Path/MyProfile.ext')
-		self.assertEqual('~/Library/MobileDevice/Provisioning Profiles/{0}.MyProfile.ext'.format(self.prefix), dstPath)
\ No newline at end of file
+		self.assertEqual('~/Library/MobileDevice/Provisioning Profiles/{0}.MyProfile.ext'.format(self.prefix), dstPath)
diff --git a/scripts/TouchinBuild/parsers/InsideParser/InsideRemoveParser.py b/scripts/TouchinBuild/parsers/InsideParser/InsideRemoveParser.py
index 435acd2..3ec570e 100644
--- a/scripts/TouchinBuild/parsers/InsideParser/InsideRemoveParser.py
+++ b/scripts/TouchinBuild/parsers/InsideParser/InsideRemoveParser.py
@@ -1,5 +1,6 @@
 import re
 from parsers.InsideParser.InsideParserBase import InsideParserBase
+from parsers.RegexpBuilder import RegexpBuilder
 
 
 class InsideRemoveParser(InsideParserBase):
@@ -20,7 +21,9 @@ class InsideRemoveParser(InsideParserBase):
 		filePathRegexp = r"'(?P<file>[./ a-zA-Z]+\.{0})'".format(self.fileExt)
 		projectNameRegexp = r'(?P<project>[.a-zA-Z]+)'
 
-		regexpSource = self.startsWith('inside') + filePathRegexp + self.keywordToken('remove') + projectNameRegexp + self.spaceEndsWith('project')
+		rb = RegexpBuilder()
+		regexpSource = rb.startsWith('inside') + filePathRegexp + rb.keywordToken('remove') + projectNameRegexp + \
+					   rb.spaceEndsWith('project')
 		regexp = re.compile(regexpSource, re.UNICODE)
 
 		match = regexp.match(line)
diff --git a/scripts/TouchinBuild/parsers/InsideParser/InsideSetParser.py b/scripts/TouchinBuild/parsers/InsideParser/InsideSetParser.py
index 2c9f883..aadf89d 100644
--- a/scripts/TouchinBuild/parsers/InsideParser/InsideSetParser.py
+++ b/scripts/TouchinBuild/parsers/InsideParser/InsideSetParser.py
@@ -1,5 +1,6 @@
 import re
 from parsers.InsideParser.InsideParserBase import InsideParserBase
+from parsers.RegexpBuilder import RegexpBuilder
 
 
 class InsideSetParser(InsideParserBase):
@@ -21,8 +22,9 @@ class InsideSetParser(InsideParserBase):
 		keyRegexp = r'(?P<key>[a-zA-Z]+)'
 		valueRegexp = r"'(?P<value>[^']+)'$"
 
-		regexpSource = self.startsWith('inside') + self.filePathRegexp + self.keywordToken('set') + keyRegexp + \
-					   self.keywordToken('to') + valueRegexp
+		rb = RegexpBuilder()
+		regexpSource = rb.startsWith('inside') + self.filePathRegexp + rb.keywordToken('set') + keyRegexp + \
+					   rb.keywordToken('to') + valueRegexp
 		regexp = re.compile(regexpSource, re.UNICODE)
 
 		match = regexp.match(line)
diff --git a/scripts/TouchinBuild/parsers/RegexpBuilder.py b/scripts/TouchinBuild/parsers/RegexpBuilder.py
index ffa28f4..90df74d 100644
--- a/scripts/TouchinBuild/parsers/RegexpBuilder.py
+++ b/scripts/TouchinBuild/parsers/RegexpBuilder.py
@@ -1,4 +1,7 @@
 class RegexpBuilder:
+	def __init__(self):
+		pass
+
 	def keywordToken(self, keyword):
 		assert keyword is not None
 		return r'\s+' + keyword + r'\s+'
diff --git a/scripts/TouchinBuild/utils/IncludeProcessor.py b/scripts/TouchinBuild/utils/IncludeProcessor.py
index 8357997..41b9ffe 100644
--- a/scripts/TouchinBuild/utils/IncludeProcessor.py
+++ b/scripts/TouchinBuild/utils/IncludeProcessor.py
@@ -1,5 +1,4 @@
 import re
-from parsers.LineParser import LineParser
 from parsers.RegexpBuilder import RegexpBuilder