Index: Tools/Test/Manager.cls.xml
===================================================================
diff -u -r2815 -r2816
--- Tools/Test/Manager.cls.xml	(.../Manager.cls.xml)	(revision 2815)
+++ Tools/Test/Manager.cls.xml	(.../Manager.cls.xml)	(revision 2816)
@@ -283,8 +283,13 @@
 ]]></Implementation>
 </Method>
 
+<Property name="StoryPattern">
+<Type>%String</Type>
+<InitialExpression>"2.3A3.4N"</InitialExpression>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Method name="IsValidName">
-<ClassMethod>1</ClassMethod>
 <FormalSpec>ClassName:%String,SubString:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
@@ -307,7 +312,7 @@
 	
 	if IsValid {
 		#dim LastPart = ##class(TECH.StringUtils).GetLastPart(ClassName,".")
-		set:(LastPart?2.3A3.4N) IsValid = +$get(^SYS("RunAcceptanceTest",LastPart))	
+		set:##class(TECH.StringUtils).MatchesPattern(LastPart,..StoryPattern) IsValid = +$get(^SYS("RunAcceptanceTest",LastPart))	
 	}
 	quit IsValid
 ]]></Implementation>