Index: Tools/Mock/MockCreator.cls.xml
===================================================================
diff -u -r866 -r914
--- Tools/Mock/MockCreator.cls.xml	(.../MockCreator.cls.xml)	(revision 866)
+++ Tools/Mock/MockCreator.cls.xml	(.../MockCreator.cls.xml)	(revision 914)
@@ -100,7 +100,7 @@
 		set Method.SequenceNumber=1
 		
 		#dim APIClassName As %String = ##class(TECH.StringUtils).GetLastPart(..Class.Name,".")
-		do Method.Implementation.WriteLine($char(9)_"do ##class("_..GetContextClassName()_").Instance().Push"_APIClassName_"ClassName("""_..MockClass.Name_""")")
+		do Method.Implementation.WriteLine($char(9)_"do ##class("_..GetContextClassName()_").Instance().Push"_APIClassName_"ClassName(##class("_..MockClass.Name_").%ClassName(1))")
 		do Method.Implementation.WriteLine($char(9)_"quit ##class("_..GetContextClassName()_").Instance().Geef"_APIClassName_"()")
 
 		do Method.%Save()