diff --git a/libs/libclkarchopenfpga/arch/example_internal_drivers.xml b/libs/libclkarchopenfpga/arch/example_internal_drivers.xml
index 6215ba443..d6435523c 100644
--- a/libs/libclkarchopenfpga/arch/example_internal_drivers.xml
+++ b/libs/libclkarchopenfpga/arch/example_internal_drivers.xml
@@ -2,10 +2,10 @@
   <clock_network name="example_network" global_port="clk[0:7]"> 
     <spine name="spine_lvl3" start_x="0" start_y="2" end_x="2" end_y="2"> 
       <switch_point tap="spine_lvl2_upper" x="2" y="2"> 
-        <internal_driver tile_pin="clb.O[0:3]"/>
+        <internal_driver from_pin="clb.O[0:3]" to_pin="clk[1:1]"/>
       </switch_point>
       <switch_point tap="spine_lvl2_lower" x="2" y="2"> 
-        <internal_driver tile_pin="clb.O[0:3]"/>
+        <internal_driver from_pin="clb.O[0:3]" to_pin="clk[0:0]"/>
       </switch_point>
     </spine>  
     <spine name="spine_lvl2_upper" start_x="2" start_y="2" end_x="2" end_y="3"> 
diff --git a/libs/libclkarchopenfpga/src/io/clock_network_xml_constants.h b/libs/libclkarchopenfpga/src/io/clock_network_xml_constants.h
index a63141870..65e828573 100644
--- a/libs/libclkarchopenfpga/src/io/clock_network_xml_constants.h
+++ b/libs/libclkarchopenfpga/src/io/clock_network_xml_constants.h
@@ -25,7 +25,9 @@ constexpr const char* XML_CLOCK_SPINE_SWITCH_POINT_NODE_NAME = "switch_point";
 constexpr const char* XML_CLOCK_SPINE_SWITCH_POINT_INTERNAL_DRIVER_NODE_NAME =
   "internal_driver";
 constexpr const char*
-  XML_CLOCK_SPINE_SWITCH_POINT_INTERNAL_DRIVER_ATTRIBUTE_TILE_PIN = "tile_pin";
+  XML_CLOCK_SPINE_SWITCH_POINT_INTERNAL_DRIVER_ATTRIBUTE_FROM_PIN = "from_pin";
+constexpr const char*
+  XML_CLOCK_SPINE_SWITCH_POINT_INTERNAL_DRIVER_ATTRIBUTE_TO_PIN = "to_pin";
 constexpr const char* XML_CLOCK_SPINE_SWITCH_POINT_ATTRIBUTE_TAP = "tap";
 constexpr const char* XML_CLOCK_SPINE_SWITCH_POINT_ATTRIBUTE_X = "x";
 constexpr const char* XML_CLOCK_SPINE_SWITCH_POINT_ATTRIBUTE_Y = "y";
diff --git a/libs/libclkarchopenfpga/src/io/read_xml_clock_network.cpp b/libs/libclkarchopenfpga/src/io/read_xml_clock_network.cpp
index c56b152fd..8e7116f62 100644
--- a/libs/libclkarchopenfpga/src/io/read_xml_clock_network.cpp
+++ b/libs/libclkarchopenfpga/src/io/read_xml_clock_network.cpp
@@ -163,13 +163,19 @@ static void read_xml_clock_spine_switch_point_internal_driver(
                    "Invalid id of a clock spine!\n");
   }
 
-  std::string int_driver_port_name =
+  std::string int_driver_from_port_name =
     get_attribute(
       xml_int_driver,
-      XML_CLOCK_SPINE_SWITCH_POINT_INTERNAL_DRIVER_ATTRIBUTE_TILE_PIN, loc_data)
+      XML_CLOCK_SPINE_SWITCH_POINT_INTERNAL_DRIVER_ATTRIBUTE_FROM_PIN, loc_data)
+      .as_string();
+  std::string int_driver_to_port_name =
+    get_attribute(
+      xml_int_driver,
+      XML_CLOCK_SPINE_SWITCH_POINT_INTERNAL_DRIVER_ATTRIBUTE_TO_PIN, loc_data)
       .as_string();
   clk_ntwk.add_spine_switch_point_internal_driver(spine_id, switch_point_id,
-                                                  int_driver_port_name);
+                                                  int_driver_from_port_name,
+                                                  int_driver_to_port_name);
 }
 
 /********************************************************************
diff --git a/libs/libclkarchopenfpga/src/io/write_xml_clock_network.cpp b/libs/libclkarchopenfpga/src/io/write_xml_clock_network.cpp
index e36ed9ed8..8d57618a9 100644
--- a/libs/libclkarchopenfpga/src/io/write_xml_clock_network.cpp
+++ b/libs/libclkarchopenfpga/src/io/write_xml_clock_network.cpp
@@ -126,8 +126,11 @@ static int write_xml_clock_spine_switch_point(
       openfpga::write_tab_to_file(fp, 4);
       fp << "<" << XML_CLOCK_SPINE_SWITCH_POINT_INTERNAL_DRIVER_NODE_NAME;
       write_xml_attribute(
-        fp, XML_CLOCK_SPINE_SWITCH_POINT_INTERNAL_DRIVER_ATTRIBUTE_TILE_PIN,
-        clk_ntwk.internal_driver_port(int_driver_id).c_str());
+        fp, XML_CLOCK_SPINE_SWITCH_POINT_INTERNAL_DRIVER_ATTRIBUTE_FROM_PIN,
+        clk_ntwk.internal_driver_from_pin(int_driver_id).c_str());
+      write_xml_attribute(
+        fp, XML_CLOCK_SPINE_SWITCH_POINT_INTERNAL_DRIVER_ATTRIBUTE_TO_PIN,
+        clk_ntwk.internal_driver_to_pin(int_driver_id).c_str());
       fp << "/>"
          << "\n";
     }