diff -r c36e3195e3e9 -r 9c955076ffe3 transforms/generate-cleanup
--- a/transforms/generate-cleanup	Mon Jan 25 15:32:12 2016 -0800
+++ b/transforms/generate-cleanup	Thu Jan 21 09:20:59 2016 -0800
@@ -18,14 +18,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
 # This set of transforms is intended to be used to convert a set of actions
 # generated by "pkgsend generate ..." into a more generic set of actions with
 # most attributes removed and paths converted to use strategically placed
-# macros to remove plartform or version specifics.
+# macros to remove platform or version specifics.
 #
 
 # convert the "pkgsend generate" file "hash" to a common value
@@ -76,14 +76,14 @@
 # 	edit target "$(COMPONENT_NAME)" "$!(COMPONENT_NAME)">
 
 <transform dir file link hardlink -> \
-    edit path "$(COMPONENT_VERSION)" "$!(COMPONENT_VERSION)">
+    edit path "$(COMPONENT_RE_VERSION)" "$!(COMPONENT_VERSION)">
 <transform dir file link hardlink -> \
-    edit target "$(COMPONENT_VERSION)" "$!(COMPONENT_VERSION)">
+    edit target "$(COMPONENT_RE_VERSION)" "$!(COMPONENT_VERSION)">
 
 <transform dir file link hardlink -> \
-    edit path "$(IPS_VERSION)" "$!(IPS_VERSION)">
+    edit path "$(IPS_RE_VERSION)" "$!(IPS_VERSION)">
 <transform dir file link hardlink -> \
-    edit target "$(IPS_VERSION)" "$!(IPS_VERSION)">
+    edit target "$(IPS_RE_VERSION)" "$!(IPS_VERSION)">
 
 # convert temporary macro names to their real name
 <transform set -> \