diff --git a/relation/interfaces.py b/relation/interfaces.py
index 48c31b7..ddab3a0 100644
--- a/relation/interfaces.py
+++ b/relation/interfaces.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2005 Helmut Merz helmutm@cy55.de
+#  Copyright (c) 2020 Helmut Merz helmutm@cy55.de
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -18,12 +18,10 @@
 
 """
 interface definitions for the Relations utility and relation objects.
-
-$Id$
 """
 
 from zope.interface import Interface, Attribute
-from zope.component.interfaces import IObjectEvent
+from zope.interface.interfaces import IObjectEvent
 
 
 # relation interfaces
diff --git a/stateful/base.py b/stateful/base.py
index dd9b4f1..0373ecd 100644
--- a/stateful/base.py
+++ b/stateful/base.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2013 Helmut Merz helmutm@cy55.de
+#  Copyright (c) 2020 Helmut Merz helmutm@cy55.de
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -24,10 +24,7 @@ from persistent.interfaces import IPersistent
 from persistent.mapping import PersistentMapping
 from zope import component
 from zope.component import adapts
-try:
-    from zope.component.interfaces import ObjectEvent
-except ImportError: # Zope 2.9
-    from zope.app.event.objectevent import ObjectEvent
+from zope.interface.interfaces import ObjectEvent
 from zope.event import notify
 from zope.interface import implements
 
diff --git a/stateful/interfaces.py b/stateful/interfaces.py
index 14d0aa1..8dcdad4 100644
--- a/stateful/interfaces.py
+++ b/stateful/interfaces.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2013 Helmut Merz helmutm@cy55.de
+#  Copyright (c) 2020 Helmut Merz helmutm@cy55.de
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -20,10 +20,7 @@
 Interfaces for the `stateful` package.
 """
 
-try:
-    from zope.component.interfaces import IObjectEvent
-except ImportError: # Zope 2.9
-    from zope.app.event.interfaces import IObjectEvent
+from zope.interface.interfaces import IObjectEvent
 from zope.interface import Interface, Attribute
 
 
diff --git a/util/multikey.txt b/util/multikey.txt
index 142a4f9..c1aaf82 100644
--- a/util/multikey.txt
+++ b/util/multikey.txt
@@ -2,7 +2,6 @@
 Indexed Collections for Various Purposes
 ========================================
 
-$Id$
 
 Multikey Dictionaries
 =====================
@@ -66,9 +65,9 @@ Index entries that are present in the stored dictionary must always match:
 If you don't know any more what entries we had added to the registry just
 query its items() method:
 
-  >>> registry.items()
-  ((('edit.html', 'topic', 'zope3', 'Custom'), 'very special edit.html'),
-   (('edit.html', None, None, 'Custom'), 'edit.html for Custom skin'),
+  >>> sorted(registry.items())
+  [(('edit.html', None, None, 'Custom'), 'edit.html for Custom skin'), 
+   (('edit.html', 'topic', 'zope3', 'Custom'), 'very special edit.html'),
    (('index.html', None, None, None), 'global index.html'),
    (('index.html', None, None, 'Custom'), 'Global index.html for Custom skin'),
-   (('index.html', 'topic', None, None), 'index.html for type "topic"'))
+   (('index.html', 'topic', None, None), 'index.html for type "topic"')]