--- a/components/python/pytest-codecheckers/pytest-codecheckers-PYVER.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pytest-codecheckers/pytest-codecheckers-PYVER.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/pytest-codecheckers-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/pytest-codecheckers-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="A pytest plugin to add source code sanity checks (pep8 and friends)"
 set name=pkg.description \
@@ -48,22 +48,26 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pytest_codecheckers-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 license pytest-codecheckers.license license=MIT
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/pytest-codecheckers-$(PYV)@0.2,5.11-0.175.3.0.0.16.0
+
 # force a dependency on the Python runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
 
 # force a dependency on pep8; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pep8-$(PYV)
+depend type=require fmri=library/python/pep8-$(PYV)
 
 # force a dependency on py; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/py-$(PYV)
+depend type=require fmri=library/python/py-$(PYV)
 
 # force a dependency on pyflakes; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pyflakes-$(PYV)
+depend type=require fmri=library/python/pyflakes-$(PYV)
 
 # force a dependency on pytest
-depend type=require fmri=library/python-2/pytest-$(PYV)
+depend type=require fmri=library/python/pytest-$(PYV)
 
 # force a dependency on the pytest-codecheckers package
 depend type=require \
-    fmri=library/python-2/pytest-codecheckers@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/pytest-codecheckers@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)