diff --git a/examples/iec61850_9_2_LE_example/iec61850_9_2_LE_example.c b/examples/iec61850_9_2_LE_example/iec61850_9_2_LE_example.c
index d29a095d..640fff3c 100644
--- a/examples/iec61850_9_2_LE_example/iec61850_9_2_LE_example.c
+++ b/examples/iec61850_9_2_LE_example/iec61850_9_2_LE_example.c
@@ -157,7 +157,7 @@ main(int argc, char** argv)
         IedServer_updateQuality(iedServer, IEDMODEL_MUnn_TCTR2_Amp_q, q);
         IedServer_updateInt32AttributeValue(iedServer, IEDMODEL_MUnn_TCTR3_Amp_instMag_i, current);
         IedServer_updateQuality(iedServer, IEDMODEL_MUnn_TCTR3_Amp_q, q);
-        IedServer_updateInt32AttributeValue(iedServer, IEDMODEL_MUnn_TCTR3_Amp_instMag_i, current);
+        IedServer_updateInt32AttributeValue(iedServer, IEDMODEL_MUnn_TCTR4_Amp_instMag_i, current);
         IedServer_updateQuality(iedServer, IEDMODEL_MUnn_TCTR4_Amp_q, q);
 
         IedServer_updateInt32AttributeValue(iedServer, IEDMODEL_MUnn_TVTR1_Vol_instMag_i, voltage);
diff --git a/examples/iec61850_9_2_LE_example/static_model.c b/examples/iec61850_9_2_LE_example/static_model.c
index ada63aad..5b3043f5 100644
--- a/examples/iec61850_9_2_LE_example/static_model.c
+++ b/examples/iec61850_9_2_LE_example/static_model.c
@@ -22,7 +22,7 @@ extern DataSetEntry iedModelds_MUnn_LLN0_PhsMeas1_fcda7;
 DataSetEntry iedModelds_MUnn_LLN0_PhsMeas1_fcda0 = {
   "MUnn",
   false,
-  "TCTR1$MX$Amp$instMag$i",
+  "TCTR1$MX$Amp",
   -1,
   NULL,
   NULL,
@@ -32,7 +32,7 @@ DataSetEntry iedModelds_MUnn_LLN0_PhsMeas1_fcda0 = {
 DataSetEntry iedModelds_MUnn_LLN0_PhsMeas1_fcda1 = {
   "MUnn",
   false,
-  "TCTR2$MX$Amp$instMag$i",
+  "TCTR2$MX$Amp",
   -1,
   NULL,
   NULL,
@@ -42,7 +42,7 @@ DataSetEntry iedModelds_MUnn_LLN0_PhsMeas1_fcda1 = {
 DataSetEntry iedModelds_MUnn_LLN0_PhsMeas1_fcda2 = {
   "MUnn",
   false,
-  "TCTR3$MX$Amp$instMag$i",
+  "TCTR3$MX$Amp",
   -1,
   NULL,
   NULL,
@@ -52,7 +52,7 @@ DataSetEntry iedModelds_MUnn_LLN0_PhsMeas1_fcda2 = {
 DataSetEntry iedModelds_MUnn_LLN0_PhsMeas1_fcda3 = {
   "MUnn",
   false,
-  "TCTR4$MX$Amp$instMag$i",
+  "TCTR4$MX$Amp",
   -1,
   NULL,
   NULL,
@@ -62,7 +62,7 @@ DataSetEntry iedModelds_MUnn_LLN0_PhsMeas1_fcda3 = {
 DataSetEntry iedModelds_MUnn_LLN0_PhsMeas1_fcda4 = {
   "MUnn",
   false,
-  "TVTR1$MX$Vol$instMag$i",
+  "TVTR1$MX$Vol",
   -1,
   NULL,
   NULL,
@@ -72,7 +72,7 @@ DataSetEntry iedModelds_MUnn_LLN0_PhsMeas1_fcda4 = {
 DataSetEntry iedModelds_MUnn_LLN0_PhsMeas1_fcda5 = {
   "MUnn",
   false,
-  "TVTR2$MX$Vol$instMag$i",
+  "TVTR2$MX$Vol",
   -1,
   NULL,
   NULL,
@@ -82,7 +82,7 @@ DataSetEntry iedModelds_MUnn_LLN0_PhsMeas1_fcda5 = {
 DataSetEntry iedModelds_MUnn_LLN0_PhsMeas1_fcda6 = {
   "MUnn",
   false,
-  "TVTR3$MX$Vol$instMag$i",
+  "TVTR3$MX$Vol",
   -1,
   NULL,
   NULL,
@@ -92,7 +92,7 @@ DataSetEntry iedModelds_MUnn_LLN0_PhsMeas1_fcda6 = {
 DataSetEntry iedModelds_MUnn_LLN0_PhsMeas1_fcda7 = {
   "MUnn",
   false,
-  "TVTR4$MX$Vol$instMag$i",
+  "TVTR4$MX$Vol",
   -1,
   NULL,
   NULL,
diff --git a/examples/iec61850_9_2_LE_example/sv.icd b/examples/iec61850_9_2_LE_example/sv.icd
index 9ef2d1a1..b52f8d92 100644
--- a/examples/iec61850_9_2_LE_example/sv.icd
+++ b/examples/iec61850_9_2_LE_example/sv.icd
@@ -74,21 +74,21 @@ SCL.xsd">
 						<DataSet name="PhsMeas1">
 
 							<FCDA ldInst="MUnn" lnClass="TCTR" lnInst="1" fc="MX"
-								doName="Amp" daName="instMag.i"/>
+								doName="Amp" />
 							<FCDA ldInst="MUnn" lnClass="TCTR" lnInst="2" fc="MX"
-								doName="Amp" daName="instMag.i"/>
+								doName="Amp" />
 							<FCDA ldInst="MUnn" lnClass="TCTR" lnInst="3" fc="MX"
-								doName="Amp" daName="instMag.i"/>
+								doName="Amp" />
 							<FCDA ldInst="MUnn" lnClass="TCTR" lnInst="4" fc="MX"
-								doName="Amp" daName="instMag.i"/>
+								doName="Amp" />
 							<FCDA ldInst="MUnn" lnClass="TVTR" lnInst="1" fc="MX"
-								doName="Vol" daName="instMag.i"/>
+								doName="Vol" />
 							<FCDA ldInst="MUnn" lnClass="TVTR" lnInst="2" fc="MX"
-								doName="Vol" daName="instMag.i"/>
+								doName="Vol" />
 							<FCDA ldInst="MUnn" lnClass="TVTR" lnInst="3" fc="MX"
-								doName="Vol"  daName="instMag.i"/>
+								doName="Vol" />
 							<FCDA ldInst="MUnn" lnClass="TVTR" lnInst="4" fc="MX"
-								doName="Vol" daName="instMag.i"/>
+								doName="Vol" />
 
 						</DataSet>
 
diff --git a/examples/server_example_basic_io/server_example_basic_io.c b/examples/server_example_basic_io/server_example_basic_io.c
index b77b814c..b77aa086 100644
--- a/examples/server_example_basic_io/server_example_basic_io.c
+++ b/examples/server_example_basic_io/server_example_basic_io.c
@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "../server_example_basic_io/static_model.h"
+#include "static_model.h"
 
 /* import IEC 61850 device model created from SCL-File */
 extern IedModel iedModel;