diff --git a/scripts/TouchinBuild/Tests/UnitTests/XmlParcher/test_manifestPatcher.py b/scripts/TouchinBuild/Tests/UnitTests/XmlParcher/test_manifestPatcher.py
new file mode 100644
index 0000000..de75c4f
--- /dev/null
+++ b/scripts/TouchinBuild/Tests/UnitTests/XmlParcher/test_manifestPatcher.py
@@ -0,0 +1,16 @@
+import unittest
+from utils.ManifestPatcher import ManifestPatcher
+
+
+class TestManifestPatcher(unittest.TestCase):
+	def setUp(self):
+		self.patcher = ManifestPatcher('somePath')
+
+	def test_parseRawName(self):
+		nameInfo1 = self.patcher.parseRawName('simpleName')
+		self.assertEqual(None, nameInfo1['prefix'])
+		self.assertEqual('simpleName', nameInfo1['original_name'])
+
+		nameInfo2 = self.patcher.parseRawName('prefix:originalName')
+		self.assertEqual('prefix', nameInfo2['prefix'])
+		self.assertEqual('originalName', nameInfo2['original_name'])
diff --git a/scripts/TouchinBuild/utils/ManifestPatcher.py b/scripts/TouchinBuild/utils/ManifestPatcher.py
index 4520f40..650eccd 100644
--- a/scripts/TouchinBuild/utils/ManifestPatcher.py
+++ b/scripts/TouchinBuild/utils/ManifestPatcher.py
@@ -35,11 +35,11 @@ class ManifestPatcher(XmlPatcher):
 		"""
 
 		result = rawName.split(':')
-		prefixExists = len(result) > 0
+		prefixExists = len(result) > 1
 
 		atrInfo = {
 			'prefix': result[0] if prefixExists else None,
-			'original_name': result[1]
+			'original_name': result[1] if prefixExists else result[0]
 		}
 
 		return atrInfo