Index: src/zope/app/applicationcontrol/ftesting.zcml
===================================================================
--- src/zope/app/applicationcontrol/ftesting.zcml	(revision 88973)
+++ src/zope/app/applicationcontrol/ftesting.zcml	(working copy)
@@ -15,7 +15,7 @@
   <include package="zope.app.securitypolicy" />
 
   <securityPolicy
-    component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
+    component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
 
   <role id="zope.Manager" title="Site Manager" />
 
Index: src/zope/app/cache/browser/cacheable.py
===================================================================
--- src/zope/app/cache/browser/cacheable.py	(revision 88973)
+++ src/zope/app/cache/browser/cacheable.py	(working copy)
@@ -23,7 +23,7 @@
 
 from zope.app.cache.caching import getCacheForObject, getLocationForCache
 from zope.app.form.utility import setUpEditWidgets
-from zope.app.i18n import ZopeMessageFactory as _
+from zope.i18nmessageid import ZopeMessageFactory as _
 from zope.app.cache.interfaces import ICacheable
 from zope.app.form.interfaces import WidgetInputError
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
Index: src/zope/app/pagetemplate/ftesting.zcml
===================================================================
--- src/zope/app/pagetemplate/ftesting.zcml	(revision 88973)
+++ src/zope/app/pagetemplate/ftesting.zcml	(working copy)
@@ -15,7 +15,7 @@
   <include package="zope.app.securitypolicy" />
 
   <securityPolicy
-    component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
+    component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
 
   <role id="zope.Manager" title="Site Manager" />
 
Index: src/zope/app/pythonpage/browser.py
===================================================================
--- src/zope/app/pythonpage/browser.py	(revision 88973)
+++ src/zope/app/pythonpage/browser.py	(working copy)
@@ -16,7 +16,7 @@
 $Id$
 """
 from zope.app.form.browser.editview import EditView
-from zope.app.i18n import ZopeMessageFactory as _
+from zope.i18nmessageid import ZopeMessageFactory as _
 
 class PythonPageEval(object):
     """Evaluate the Python Page."""
Index: src/zope/app/wsgi/ftesting.zcml
===================================================================
--- src/zope/app/wsgi/ftesting.zcml	(revision 88973)
+++ src/zope/app/wsgi/ftesting.zcml	(working copy)
@@ -13,7 +13,7 @@
   <include package="zope.app.securitypolicy" />
 
   <securityPolicy
-    component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
+    component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
 
   <role id="zope.Manager" title="Site Manager" />
 
Index: src/zope/traversing/tests/ftesting.zcml
===================================================================
--- src/zope/traversing/tests/ftesting.zcml	(revision 88973)
+++ src/zope/traversing/tests/ftesting.zcml	(working copy)
@@ -20,7 +20,7 @@
   <include package="zope.app.securitypolicy" file="meta.zcml" />
 
   <securityPolicy
-    component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
+    component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
 
   <role id="zope.Anonymous" title="Everybody"
                  description="All users have this role implicitly" />