Index: TECH/PubSub/EventHandler.cls.xml
===================================================================
diff -u -r2997 -r2998
--- TECH/PubSub/EventHandler.cls.xml	(.../EventHandler.cls.xml)	(revision 2997)
+++ TECH/PubSub/EventHandler.cls.xml	(.../EventHandler.cls.xml)	(revision 2998)
@@ -53,14 +53,14 @@
 ]]></Implementation>
 </Method>
 
-<Method name="UnInstallViaClassName">
+<Method name="UnInstallViaClassNameEnEventType">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>ClassName:%String</FormalSpec>
+<FormalSpec>ClassName:%String,EventType:%String</FormalSpec>
 <Implementation><![CDATA[
 	#dim SubscriptionId As %String = ""
 	For  { Set SubscriptionId=$Order(^TECH.PubSub.EventSubscriptionD(SubscriptionId)) Quit:(SubscriptionId="")
 		#dim Data As %List = ^TECH.PubSub.EventSubscriptionD(SubscriptionId)
-		If (($List(Data,2) = ..GetEventType()) & ($List(Data,3) = ClassName) & ($List(Data,4) = "StartVerwerking")) {
+		If (($List(Data,2) = EventType) & ($List(Data,3) = ClassName) & ($List(Data,4) = "StartVerwerking")) {
 			Quit
 		}
 	}