diff --git a/convert_and_merge_composable_fpga_architecture.xsl b/convert_and_merge_composable_fpga_architecture.xsl
index cc4b221..7592168 100644
--- a/convert_and_merge_composable_fpga_architecture.xsl
+++ b/convert_and_merge_composable_fpga_architecture.xsl
@@ -154,12 +154,12 @@
     to
       <loc ...>BLOCK.PORT BLOCK.PORT</loc>
     -->
-  <xsl:template match="loc/port"><xsl:text>
-      </xsl:text><xsl:call-template name="from-pb_type"/>.<xsl:call-template name="port-value"/>
+  <xsl:template match="pinlocations/loc/port"><xsl:text>
+        </xsl:text><xsl:call-template name="from-pb_type"/>.<xsl:call-template name="port-value"/>
   </xsl:template>
-  <xsl:template match="loc/port[last()]"><xsl:text>
-      </xsl:text><xsl:call-template name="from-pb_type"/>.<xsl:call-template name="port-value"/><xsl:text>
-    </xsl:text>
+  <xsl:template match="pinlocations/loc/port[last()]"><xsl:text>
+        </xsl:text><xsl:call-template name="from-pb_type"/>.<xsl:call-template name="port-value"/><xsl:text>
+      </xsl:text>
   </xsl:template>
 
   <!-- Remove duplicate model nodes -->
diff --git a/convert_and_merge_composable_tests/composable-loc-implicit-parent.golden.xml b/convert_and_merge_composable_tests/composable-loc-implicit-parent.golden.xml
index 0f993d1..f6a4899 100644
--- a/convert_and_merge_composable_tests/composable-loc-implicit-parent.golden.xml
+++ b/convert_and_merge_composable_tests/composable-loc-implicit-parent.golden.xml
@@ -2,10 +2,17 @@
 <xml>
   <pb_type name="parent">
     <input name="i" width="2"/>
-    <loc>
-      parent.o
-      parent.i[0]
-      parent.i[1]
-    </loc>
+    <pinlocations>
+      <loc>
+        parent.o
+        parent.i[0]
+        parent.i[1]
+      </loc>
+    </pinlocations>
+    <random>
+      <loc>
+        <port name="o"/>
+      </loc>
+    </random>
   </pb_type>
 </xml>
diff --git a/convert_and_merge_composable_tests/composable-loc-implicit-parent.xml b/convert_and_merge_composable_tests/composable-loc-implicit-parent.xml
index 9440379..e8bc8d2 100644
--- a/convert_and_merge_composable_tests/composable-loc-implicit-parent.xml
+++ b/convert_and_merge_composable_tests/composable-loc-implicit-parent.xml
@@ -8,10 +8,17 @@
 <xml>
  <pb_type name="parent">
   <input name="i" width="2" />
-  <loc>
-   <port name="o" />
-   <port name="i" bit="0" />
-   <port name="i" bit="1" />
-  </loc>
+  <pinlocations>
+   <loc>
+    <port name="o" />
+    <port name="i" bit="0" />
+    <port name="i" bit="1" />
+   </loc>
+  </pinlocations>
+  <random>
+   <loc>
+    <port name="o" />
+   </loc>
+  </random>
  </pb_type>
 </xml>