--- a/components/python/lockfile/lockfile-PYVER.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/lockfile/lockfile-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/lockfile-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/lockfile-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="File locking module for Python"
 set name=pkg.description \
     value="The lockfile package provides a simple API for locking files. Unlike the Windows msvcrt.locking function, the fcntl.lockf and flock functions, and the deprecated posixfile module, the API is identical across both Unix and Windows platforms. The lock mechanism relies on the atomic nature of the link (on Unix) and mkdir (on Windows) system calls."
@@ -44,10 +44,14 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/lockfile/sqlitelockfile.py
 license lockfile.license license="MIT, PSFv2"
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/lockfile-$(PYV)@0.9.1,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 the lockfile package
 depend type=require \
-    fmri=library/python-2/lockfile@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/lockfile@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)