--- a/components/python/pep8/pep8-PYVER.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pep8/pep8-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/pep8-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/pep8-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="pep8 - Python style guide checker"
 set name=pkg.description \
     value="pep8 is a tool to check your Python code against some of the style conventions in PEP 8 (Style Guide for Python Code)."
@@ -50,6 +50,10 @@
     pkg.depend.bypass-generate=.*/test_pep8.*
 license pep8.license license="expat license"
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/pep8-$(PYV)@1.4.4,5.11-0.175.3.0.0.16.0
+
 # force a dependency on the pep8 package
 depend type=require \
-    fmri=library/python-2/pep8@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/pep8@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)