--- a/ztfy/utils/catalog/index.py	Tue Dec 07 17:27:24 2010 +0100
+++ b/ztfy/utils/catalog/index.py	Sun May 22 22:37:32 2011 +0200
@@ -29,8 +29,8 @@
 
 # import Zope3 packages
 from zope.app import zapi
-from zope.app.catalog.attribute import AttributeIndex
-from zope.app.container.contained import Contained
+from zope.catalog.attribute import AttributeIndex
+from zope.container.contained import Contained
 from zope.interface import implements
 from zopyx.txng3.core import config
 from zopyx.txng3.core.index import Index
@@ -40,7 +40,7 @@
 
 
 class TextIndexNG(AttributeIndex, Persistent, Contained):
-    """Adaptation of zopyx.txng3.core for use zope.app.catalog index"""
+    """Adaptation of zopyx.txng3.core for use zope.catalog index"""
 
     implements(IInjection, IStatistics, IIndexSearch, ITingIndex)