-XBT_PUBLIC_DATA(AT_surfxml_cpu_max_outgoing_rate ) AX_surfxml_cpu_max_outgoing_rate;
-#define A_surfxml_cpu_max_outgoing_rate (surfxml_bufferstack + AX_surfxml_cpu_max_outgoing_rate)
-XBT_PUBLIC_DATA(AT_surfxml_cpu_availability ) AX_surfxml_cpu_availability;
-#define A_surfxml_cpu_availability (surfxml_bufferstack + AX_surfxml_cpu_availability)
-XBT_PUBLIC_DATA(AT_surfxml_cpu_interference_recv ) AX_surfxml_cpu_interference_recv;
-#define A_surfxml_cpu_interference_recv (surfxml_bufferstack + AX_surfxml_cpu_interference_recv)
-XBT_PUBLIC_DATA(AT_surfxml_network_link_name ) AX_surfxml_network_link_name;
-#define A_surfxml_network_link_name (surfxml_bufferstack + AX_surfxml_network_link_name)
-XBT_PUBLIC_DATA(AT_surfxml_cpu_power ) AX_surfxml_cpu_power;
-#define A_surfxml_cpu_power (surfxml_bufferstack + AX_surfxml_cpu_power)
+XBT_PUBLIC_DATA(AT_surfxml_link_bandwidth ) AX_surfxml_link_bandwidth;
+#define A_surfxml_link_bandwidth (surfxml_bufferstack + AX_surfxml_link_bandwidth)
+XBT_PUBLIC_DATA(AT_surfxml_link_latency ) AX_surfxml_link_latency;
+#define A_surfxml_link_latency (surfxml_bufferstack + AX_surfxml_link_latency)