--- a/components/python/heatclient/heatclient-PYVER.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/heatclient/heatclient-PYVER.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -20,13 +20,13 @@
 #
 
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 # pyyaml is only delivered for python 2.6
 <transform depend type=require fmri=library/python-2/pyyaml-27 -> drop>
 # 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/heatclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
@@ -92,22 +92,16 @@
 
 # force a group dependency on the optional anyjson; pkgdepend work is needed to
 # flush this out.
-depend type=group fmri=library/python-2/anyjson-$(PYV)
-
-# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/argparse-$(PYV)
-
-# force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/babel-$(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=group fmri=library/python/anyjson-$(PYV)
 
 # force a dependency on pyyaml; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python-2/pyyaml-$(PYV)
 
-# force a dependency on requests; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/requests-$(PYV)
+# force a dependency on argparse; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/argparse-$(PYV)
+
+# force a dependency on babel; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/babel-$(PYV)
 
 # force a dependency on the heatclient package
 depend type=require \
@@ -122,5 +116,11 @@
 # force a dependency on pbr; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/pbr-$(PYV)
 
+# force a dependency on prettytable; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/prettytable-$(PYV)
+
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-$(PYV)
+
 # force a dependency on six; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/six-$(PYV)