Index: src/libchcore/Tests/TestsTStringPatternArray.cpp
===================================================================
diff -u -N -r3401d5079f33b29a7783b65bfad5f34d89a33ba5 -r6d90b96005710c802d5f141b69528e9e87a380c9
--- src/libchcore/Tests/TestsTStringPatternArray.cpp	(.../TestsTStringPatternArray.cpp)	(revision 3401d5079f33b29a7783b65bfad5f34d89a33ba5)
+++ src/libchcore/Tests/TestsTStringPatternArray.cpp	(.../TestsTStringPatternArray.cpp)	(revision 6d90b96005710c802d5f141b69528e9e87a380c9)
@@ -18,8 +18,8 @@
 {
 	TStringPatternArray arrPatterns;
 
-	arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_Wildcard));
-	arrPatterns.Add(TStringPattern(L"*.exe", TStringPattern::EPatternType::eType_Wildcard));
+	arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_FilenameWildcard));
+	arrPatterns.Add(TStringPattern(L"*.exe", TStringPattern::EPatternType::eType_FilenameWildcard));
 
 	EXPECT_EQ(2UL, arrPatterns.GetCount());
 	EXPECT_STREQ(L"*.bat", arrPatterns.GetAt(0).ToString().c_str());
@@ -30,8 +30,8 @@
 {
 	TStringPatternArray arrPatterns;
 
-	arrPatterns.InsertAt(0, TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_Wildcard));
-	arrPatterns.InsertAt(0, TStringPattern(L"*.exe", TStringPattern::EPatternType::eType_Wildcard));
+	arrPatterns.InsertAt(0, TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_FilenameWildcard));
+	arrPatterns.InsertAt(0, TStringPattern(L"*.exe", TStringPattern::EPatternType::eType_FilenameWildcard));
 
 	EXPECT_EQ(2UL, arrPatterns.GetCount());
 	EXPECT_STREQ(L"*.bat", arrPatterns.GetAt(1).ToString().c_str());
@@ -42,10 +42,10 @@
 {
 	TStringPatternArray arrPatterns;
 
-	arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_Wildcard));
-	arrPatterns.Add(TStringPattern(L"*.exe", TStringPattern::EPatternType::eType_Wildcard));
+	arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_FilenameWildcard));
+	arrPatterns.Add(TStringPattern(L"*.exe", TStringPattern::EPatternType::eType_FilenameWildcard));
 
-	arrPatterns.SetAt(0, TStringPattern(L"*.com", TStringPattern::EPatternType::eType_Wildcard));
+	arrPatterns.SetAt(0, TStringPattern(L"*.com", TStringPattern::EPatternType::eType_FilenameWildcard));
 
 	EXPECT_EQ(2UL, arrPatterns.GetCount());
 	EXPECT_STREQ(L"*.com", arrPatterns.GetAt(0).ToString().c_str());
@@ -56,8 +56,8 @@
 {
 	TStringPatternArray arrPatterns;
 
-	arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_Wildcard));
-	arrPatterns.Add(TStringPattern(L"*.exe", TStringPattern::EPatternType::eType_Wildcard));
+	arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_FilenameWildcard));
+	arrPatterns.Add(TStringPattern(L"*.exe", TStringPattern::EPatternType::eType_FilenameWildcard));
 
 	arrPatterns.RemoveAt(0);
 
@@ -69,8 +69,8 @@
 {
 	TStringPatternArray arrPatterns;
 
-	arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_Wildcard));
-	arrPatterns.Add(TStringPattern(L"*.exe", TStringPattern::EPatternType::eType_Wildcard));
+	arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_FilenameWildcard));
+	arrPatterns.Add(TStringPattern(L"*.exe", TStringPattern::EPatternType::eType_FilenameWildcard));
 
 	arrPatterns.Clear();
 
@@ -83,8 +83,8 @@
 {
 	TStringPatternArray arrPatterns;
 
-	arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_Wildcard));
-	arrPatterns.Add(TStringPattern(L"*.exe", TStringPattern::EPatternType::eType_Wildcard));
+	arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_FilenameWildcard));
+	arrPatterns.Add(TStringPattern(L"*.exe", TStringPattern::EPatternType::eType_FilenameWildcard));
 
 	EXPECT_TRUE(arrPatterns.MatchesAny(PathFromString(L"autostart.bat")));
 }
@@ -93,8 +93,8 @@
 {
 	TStringPatternArray arrPatterns;
 
-	arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_Wildcard));
-	arrPatterns.Add(TStringPattern(L"*.exe", TStringPattern::EPatternType::eType_Wildcard));
+	arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_FilenameWildcard));
+	arrPatterns.Add(TStringPattern(L"*.exe", TStringPattern::EPatternType::eType_FilenameWildcard));
 
 	EXPECT_FALSE(arrPatterns.MatchesAny(PathFromString(L"autostart.com")));
 }
@@ -105,8 +105,8 @@
 {
 	TStringPatternArray arrPatterns;
 
-	arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_Wildcard));
-	arrPatterns.Add(TStringPattern(L"autostart.*", TStringPattern::EPatternType::eType_Wildcard));
+	arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_FilenameWildcard));
+	arrPatterns.Add(TStringPattern(L"autostart.*", TStringPattern::EPatternType::eType_FilenameWildcard));
 
 	EXPECT_TRUE(arrPatterns.MatchesAll(PathFromString(L"autostart.bat")));
 }
@@ -115,8 +115,8 @@
 {
 	TStringPatternArray arrPatterns;
 
-	arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_Wildcard));
-	arrPatterns.Add(TStringPattern(L"autostart.*", TStringPattern::EPatternType::eType_Wildcard));
+	arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_FilenameWildcard));
+	arrPatterns.Add(TStringPattern(L"autostart.*", TStringPattern::EPatternType::eType_FilenameWildcard));
 
 	EXPECT_FALSE(arrPatterns.MatchesAll(PathFromString(L"autostart.exe")));
 }
@@ -127,8 +127,8 @@
 {
 	TStringPatternArray arrPatterns;
 
-	arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_Wildcard));
-	arrPatterns.Add(TStringPattern(L"autostart.*", TStringPattern::EPatternType::eType_Wildcard));
+	arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_FilenameWildcard));
+	arrPatterns.Add(TStringPattern(L"autostart.*", TStringPattern::EPatternType::eType_FilenameWildcard));
 
 	TStringArray arrElements = arrPatterns.ToSerializedStringArray();
 	EXPECT_EQ(2UL, arrElements.GetCount());