diff --git a/libs/libclkarchopenfpga/src/io/clock_network_xml_constants.h b/libs/libclkarchopenfpga/src/io/clock_network_xml_constants.h
index 6856a49f2..9eab6bd8f 100644
--- a/libs/libclkarchopenfpga/src/io/clock_network_xml_constants.h
+++ b/libs/libclkarchopenfpga/src/io/clock_network_xml_constants.h
@@ -23,7 +23,7 @@ constexpr const char* XML_CLOCK_SPINE_ATTRIBUTE_TYPE = "type";
 constexpr const char* XML_CLOCK_SPINE_ATTRIBUTE_DIRECTION = "direction";
 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_ARRIBUTER_TILE_PIN = "tile_pin";
+constexpr const char* XML_CLOCK_SPINE_SWITCH_POINT_INTERNAL_DRIVER_ATTRIBUTE_TILE_PIN = "tile_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 bdd3c6ab1..be73eb689 100644
--- a/libs/libclkarchopenfpga/src/io/read_xml_clock_network.cpp
+++ b/libs/libclkarchopenfpga/src/io/read_xml_clock_network.cpp
@@ -63,7 +63,7 @@ static void read_xml_clock_spine_switch_point_internal_driver(
   pugi::xml_node& xml_int_driver, const pugiutil::loc_data& loc_data,
   ClockNetwork& clk_ntwk, const ClockSpineId& spine_id, const ClockSwitchPointId& switch_point_id) {
   if (!clk_ntwk.valid_spine_id(spine_id)) {
-    archfpga_throw(loc_data.filename_c_str(), loc_data.line(xml_switch_point),
+    archfpga_throw(loc_data.filename_c_str(), loc_data.line(xml_int_driver),
                    "Invalid id of a clock spine!\n");
   }
 
@@ -71,7 +71,7 @@ static void read_xml_clock_spine_switch_point_internal_driver(
     get_attribute(xml_int_driver, XML_CLOCK_SPINE_SWITCH_POINT_INTERNAL_DRIVER_ATTRIBUTE_TILE_PIN,
                   loc_data)
       .as_string();
-  clk_ntwk.add_spine_switch_point(spine_id, switch_point_id, int_driver_port_name);
+  clk_ntwk.add_spine_switch_point_internal_driver(spine_id, switch_point_id, int_driver_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 ce8380c77..e107a4606 100644
--- a/libs/libclkarchopenfpga/src/io/write_xml_clock_network.cpp
+++ b/libs/libclkarchopenfpga/src/io/write_xml_clock_network.cpp
@@ -70,7 +70,7 @@ static int write_xml_clock_spine_switch_point(
     for (ClockInternalDriverId int_driver_id : clk_ntwk.spine_switch_point_internal_drivers(spine_id, switch_point_id)) {
       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_ARRIBUTER_TILE_PIN, clk_ntwk.internal_driver_port(int_driver_id).c_str());
+      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 << "/>"
          << "\n";
     }