--- a/components/python/cliff/cliff-PYVER.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/cliff/cliff-PYVER.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,14 +18,14 @@
 #
 # 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.
 #
 
 # argparse is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python-2/argparse-27 -> drop>
+<transform depend type=require fmri=library/python/argparse-27 -> drop>
 #
 set name=pkg.fmri \
-    value=pkg:/library/python-2/cliff-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/cliff-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Command Line Interface Formulation Framework"
 set name=pkg.description \
     value="The Python cliff module is a framework for building command line programs. It uses setuptools entry points to provide subcommands, output formatters, and other extensions."
@@ -62,19 +62,23 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/show.py
 license cliff.license license="Apache v2.0, MIT"
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/cliff-$(PYV)@1.4.5,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 argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/argparse-$(PYV)
+depend type=require fmri=library/python/argparse-$(PYV)
 
 # force a dependency on the cliff package
 depend type=require \
-    fmri=library/python-2/cliff@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/cliff@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 
 # force a dependency on cmd2; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/cmd2-$(PYV)
+depend type=require fmri=library/python/cmd2-$(PYV)
 
 # force a dependency on prettytable; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/prettytable-$(PYV)
+depend type=require fmri=library/python/prettytable-$(PYV)