--- a/components/python/pip/pip-PYVER.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pip/pip-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/pip-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/pip-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="A tool for installing and managing Python packages"
 set name=com.oracle.info.description \
     value="Pip is a tool which can install Python packages from a variety of sources including PyPI (and other indexes) using requirement specifiers, VCS project URLs, local project directories, local or remote source archives and requirement files which provide an easy way to specify a whole installation environment."
@@ -136,6 +136,10 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/wheel.py
 license pip.license license="MIT, LGPL2.1"
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/pip-$(PYV)@1.4.1,5.11-0.175.3.0.0.16.0
+
 # force a dependency on the pip package
 depend type=require \
-    fmri=library/python-2/pip@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/pip@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)