Index: AXtools/AXifPackageCleaner.cls.xml
===================================================================
diff -u -r42452 -r42457
--- AXtools/AXifPackageCleaner.cls.xml	(.../AXifPackageCleaner.cls.xml)	(revision 42452)
+++ AXtools/AXifPackageCleaner.cls.xml	(.../AXifPackageCleaner.cls.xml)	(revision 42457)
@@ -21,7 +21,7 @@
 	set ..RootPackage = RootPackage
 	do ..UsedClassNames.Clear()
 	
-	do ..GetUsedClassNamesFromProperties(RootPackage_"."_"Envelope")
+	do ..GetUsedClassNames(RootPackage_"."_"Envelope")
 	do ..AddUsedClassName(RootPackage_"."_"Envelope")
 	
 	#dim ClassIterator As TECH.Iterator = ##class(TECH.ClassUtils).GetClassesInPackageIterator(RootPackage,$$$True)
@@ -32,7 +32,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GetUsedClassNamesFromProperties">
+<Method name="GetUsedClassNames">
 <FormalSpec>ClassName:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
@@ -46,7 +46,7 @@
 		#dim Property As %Dictionary.PropertyDefinition = itProperties.Next()
 		#dim UsedClassName As %String = Property.Type
 		do ..GetUsedDerivedClasses(UsedClassName)
-		do ..GetUsedClassNamesFromProperties(UsedClassName)
+		do ..GetUsedClassNames(UsedClassName)
 		do ..AddUsedClassName(UsedClassName)
 	}
 ]]></Implementation>
@@ -61,7 +61,9 @@
 	#dim DerivedClasses As %ListOfDataTypes = ##class(TECH.ClassUtils).GetDerivedClasses(ClassName)
 	#dim Iterator As TECH.Iterator = ##class(TECH.ListIterator).%New(DerivedClasses)
 	while Iterator.HasNext() {
-		do ..AddUsedClassName(Iterator.Next())
+		#dim UsedClassName As %String = Iterator.Next()
+		do ..GetUsedClassNames(ClassName)
+		do ..AddUsedClassName(ClassName)
 	}
 ]]></Implementation>
 </Method>