diff --git a/include/SDFBlock.h b/include/SDFBlock.h
index ea547e33a2237fddd83fd58c702bd938df982a71..b62ae249b4dcb58c236e0e8854463b71cf78eaad 100644
--- a/include/SDFBlock.h
+++ b/include/SDFBlock.h
@@ -103,7 +103,7 @@ public:
     SDFBlock();
     virtual ~SDFBlock();
 
-	void loadFields(pugi::xml_node node, const pugi::xml_document& doc,
+	virtual void loadFieldsSDFB(pugi::xml_node node, const pugi::xml_document& doc,
                   std::map<pugi::xml_node, int>& physicalIndex);
 
     virtual bool loadFields(InputText& fp) throw(PacketException*);
diff --git a/include/SourceDataField.h b/include/SourceDataField.h
index 729daa274affcbc481f4d034374b3771769b8f02..85bf409ffb627d3b8e0f9c15f6c014b6c19915ff 100644
--- a/include/SourceDataField.h
+++ b/include/SourceDataField.h
@@ -34,7 +34,7 @@ public:
 
     virtual ~SourceDataField();
 	
-	virtual void loadFields(pugi::xml_node node, const pugi::xml_document& doc, std::map<pugi::xml_node, int>& physicalIndex);
+	virtual void loadFieldsSDF(pugi::xml_node node, const pugi::xml_document& doc, std::map<pugi::xml_node, int>& physicalIndex);
 
     virtual bool loadFields(InputText& fp) throw(PacketException*);
 
diff --git a/src/Packet.cpp b/src/Packet.cpp
index 3b4eae22219c42128729be305c3642fafea6462e..aa317f0bd43dda2975f290e90c6911cce4832641 100644
--- a/src/Packet.cpp
+++ b/src/Packet.cpp
@@ -131,7 +131,7 @@ void Packet::createPacketType(pugi::xml_document& doc, pugi::xml_node hNode, int
 	if(!sdfNode) throw new PacketExceptionFileFormat("<sourcedatafield> not found.");
 	PacketLib::SourceDataField* sdf = new PacketLib::SourceDataField(dfh);
 	dataField->setPacketSourceDataField(sdf);
-	sdf->loadFields(sdfNode, doc, physicalIndex);
+	sdf->loadFieldsSDF(sdfNode, doc, physicalIndex);
 	dimPacketSourceDataFieldFixed = sdf->sizeFixedPart();
 	dimPacketStartingFixedPart = dimPacketHeader + dimPacketDataFieldHeader + dimPacketSourceDataFieldFixed;
 
diff --git a/src/SDFBlock.cpp b/src/SDFBlock.cpp
index 7c3c71168642291c7c217b03ed231ce380bc0c7f..ccde8302b0ccf96f60841c5ebd650468440f95bc 100644
--- a/src/SDFBlock.cpp
+++ b/src/SDFBlock.cpp
@@ -364,7 +364,7 @@ SDFBlock::~SDFBlock()
     delete[] block;
 }
 
-void SDFBlock::loadFields(pugi::xml_node rbNode, const pugi::xml_document& doc,
+void SDFBlock::loadFieldsSDFB(pugi::xml_node rbNode, const pugi::xml_document& doc,
                             std::map<pugi::xml_node, int>& physicalIndex)
 {
 	popName = (char*) rbNode.attribute("name").value();
@@ -424,7 +424,7 @@ void SDFBlock::loadFields(pugi::xml_node rbNode, const pugi::xml_document& doc,
 			block[nblock].setRBlockType(indexRBlock);
 			block[nblock].setID(id);
 			pugi::xml_node childNode = rbNode.child(type->rblockFilename[indexRBlock]);
-			block[nblock].loadFields(childNode, doc, physicalIndex);
+			block[nblock].loadFieldsSDFB(childNode, doc, physicalIndex);
 			id++;
 		}
 	}
diff --git a/src/SourceDataField.cpp b/src/SourceDataField.cpp
index aca8a8bef4658f726e691c32e7a293d07e07084a..2b9d7c5562bcfa8e067f1bd9c0e0f98d1640a3a5 100644
--- a/src/SourceDataField.cpp
+++ b/src/SourceDataField.cpp
@@ -51,7 +51,7 @@ SourceDataField::~SourceDataField()
 
 }
 
-void SourceDataField::loadFields(pugi::xml_node node, const pugi::xml_document& doc, std::map<pugi::xml_node, int>& physicalIndex)
+void SourceDataField::loadFieldsSDF(pugi::xml_node node, const pugi::xml_document& doc, std::map<pugi::xml_node, int>& physicalIndex)
 {
         numberOfRBlocks = 1;
         rblockFilename = new char*[numberOfRBlocks];
@@ -66,7 +66,7 @@ void SourceDataField::loadFields(pugi::xml_node node, const pugi::xml_document&
         block[0].setPreviousPop(previous);
         block[0].setRBlockType(0);
         block[0].setID(0);
-        block[0].loadFields(node, doc, physicalIndex);
+        block[0].loadFieldsSDFB(node, doc, physicalIndex);
 }
 
 bool SourceDataField::loadFields(InputText& fp) throw(PacketException*)