diff --git a/CMFCollector/Collector.py b/CMFCollector/Collector.py
index f11c5d1..5b51e63 100644
--- a/CMFCollector/Collector.py
+++ b/CMFCollector/Collector.py
@@ -22,7 +22,6 @@
 
 from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
 from Products.CMFCore.PortalContent import PortalContent
-from Products.CMFCore.WorkflowCore import WorkflowAction
 from Products.CMFCore.CatalogTool import CatalogTool
 
 from Products.CMFDefault.SkinnedFolder import SkinnedFolder
@@ -30,7 +29,7 @@
 import util
 
 # Import permission names
-from Products.CMFCore import CMFCorePermissions
+from Products.CMFCore import permissions as CMFCorePermissions
 from CollectorPermissions import *
 
 from CollectorIssue import addCollectorIssue, CollectorIssue
diff --git a/CMFCollector/CollectorIssue.py b/CMFCollector/CollectorIssue.py
index 36287ae..32f99ae 100644
--- a/CMFCollector/CollectorIssue.py
+++ b/CMFCollector/CollectorIssue.py
@@ -25,15 +25,14 @@
 import util                             # Collector utilities.
 
 from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
-from Products.CMFCore.WorkflowCore import WorkflowAction
 from Products.CMFCore.utils import getToolByName
 
 from Products.CMFDefault.SkinnedFolder import SkinnedFolder
 from WebTextDocument import addWebTextDocument
 
 # Import permission names
-from Products.CMFCore.CMFCorePermissions import View
-from Products.CMFCore.CMFCorePermissions import ModifyPortalContent
+from Products.CMFCore.permissions import View
+from Products.CMFCore.permissions import ModifyPortalContent
 from CollectorPermissions import *
 
 RULE = '_' * 40
diff --git a/CMFCollector/CollectorPermissions.py b/CMFCollector/CollectorPermissions.py
index 307316e..fbe45d0 100644
--- a/CMFCollector/CollectorPermissions.py
+++ b/CMFCollector/CollectorPermissions.py
@@ -1,5 +1,5 @@
-from Products.CMFCore import CMFCorePermissions
-from Products.CMFCore.CMFCorePermissions import setDefaultRoles
+from Products.CMFCore import permissions as CMFCorePermissions
+from Products.CMFCore.permissions import setDefaultRoles
 
 # Gathering Event Related Permissions into one place
 ViewCollector = CMFCorePermissions.View
diff --git a/CMFCollector/CollectorSubset.py b/CMFCollector/CollectorSubset.py
index 88b26e4..88f0b53 100644
--- a/CMFCollector/CollectorSubset.py
+++ b/CMFCollector/CollectorSubset.py
@@ -1,6 +1,6 @@
 from Products.CMFCore.PortalContent import PortalContent
 from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
-from Products.CMFCore.CMFCorePermissions import View, ModifyPortalContent
+from Products.CMFCore.permissions import View, ModifyPortalContent
 
 from Acquisition import aq_parent
 from AccessControl import ClassSecurityInfo
diff --git a/CMFCollector/WebTextDocument.py b/CMFCollector/WebTextDocument.py
index abf1cfb..526c33d 100644
--- a/CMFCollector/WebTextDocument.py
+++ b/CMFCollector/WebTextDocument.py
@@ -33,7 +33,7 @@
 from Products.CMFDefault.Document import Document
 from Products.CMFDefault.utils import SimpleHTMLParser, bodyfinder
 
-from Products.CMFCore import CMFCorePermissions
+from Products.CMFCore import permissions as CMFCorePermissions
 from CollectorPermissions import *
 
 factory_type_information = (
diff --git a/CMFCollector/__init__.py b/CMFCollector/__init__.py
index 35c3a46..7a61e79 100644
--- a/CMFCollector/__init__.py
+++ b/CMFCollector/__init__.py
@@ -15,7 +15,7 @@
 import Collector, CollectorIssue, WebTextDocument, CollectorSubset
 import Products.CMFCore
 
-from Products.CMFCore import utils, CMFCorePermissions
+from Products.CMFCore import utils, permissions as CMFCorePermissions
 from Products.CMFCore.DirectoryView import registerDirectory
 import CollectorPermissions