--- a/components/python/mock/mock-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/mock/mock-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/mock-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/mock-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="A unittest library for creating mock objects"
 set name=pkg.description \
     value="Mock is a library for testing in Python. It allows you to replace parts of your system under test with mock objects and make assertions about how they have been used."
@@ -48,4 +48,7 @@
 
 # force a dependency on the mock package
 depend type=require \
-    fmri=library/python-2/mock@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/mock@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/mock-$(PYV)@1.0.1,5.12-5.12.0.0.0.41.0