diff --git a/PacketLib.xcodeproj/project.xcworkspace/xcshareddata/PacketLib.xccheckout b/PacketLib.xcodeproj/project.xcworkspace/xcshareddata/PacketLib.xccheckout
index 756e580aed3d1bc3bd3413c8b9742e7cb4e91b39..d6548caed0c38ef0d9fd18a7eca12e6a331af655 100644
--- a/PacketLib.xcodeproj/project.xcworkspace/xcshareddata/PacketLib.xccheckout
+++ b/PacketLib.xcodeproj/project.xcworkspace/xcshareddata/PacketLib.xccheckout
@@ -5,7 +5,7 @@
 	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
 	<false/>
 	<key>IDESourceControlProjectIdentifier</key>
-	<string>AD920CA7-23AA-4A38-B382-B72E4C2959FA</string>
+	<string>5C866F64-F91E-4DE9-B35A-4CCAE5CEE492</string>
 	<key>IDESourceControlProjectName</key>
 	<string>PacketLib</string>
 	<key>IDESourceControlProjectOriginsDictionary</key>
diff --git a/PacketLib.xcodeproj/project.xcworkspace/xcuserdata/bulgarelli.xcuserdatad/UserInterfaceState.xcuserstate b/PacketLib.xcodeproj/project.xcworkspace/xcuserdata/bulgarelli.xcuserdatad/UserInterfaceState.xcuserstate
index a3eb68eb5c480e9f7b33a04f0bef87ce98136698..a178733408eaf3121a4ad6bd46705123277e33e5 100644
Binary files a/PacketLib.xcodeproj/project.xcworkspace/xcuserdata/bulgarelli.xcuserdatad/UserInterfaceState.xcuserstate and b/PacketLib.xcodeproj/project.xcworkspace/xcuserdata/bulgarelli.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/include/Packet.h b/include/Packet.h
index 33739376f269911ff07524013e2e9bbf5cd78b69..dae41844ac74733fc5582e079671222c5f151bcb 100644
--- a/include/Packet.h
+++ b/include/Packet.h
@@ -84,8 +84,8 @@ public:
 	///\post the variable part of the "source data field" is compressed and should be sent or stored
 	virtual ByteStreamPtr compressData(enum CompressionAlgorithms compressionAlgorithm, byte compressionLevel);
 	
-	///\return decompress the data section without changing the packet  (the variable part of the "source data field")
-	virtual ByteStreamPtr decompressData();
+	///\return Get the the variable part of the source data field as a ByteStream that contains the data and decompress (if compressed) them without changing the packet  (the variable part of the "source data field")
+	virtual ByteStreamPtr getData();
 	
 	///Get the compression algorithm used for this packet
 	virtual enum CompressionAlgorithms getCompressionAlgorithm();
@@ -124,9 +124,6 @@ public:
 	///Get the the variable part of the source data field as a ByteStream
 	ByteStreamPtr getBSSourceDataFieldsVariablePart();
 	
-	///Get the the variable part of the source data field as a ByteStream that contains the data
-	ByteStreamPtr getData();
-	
 	///Get the the source data field as a ByteStream
 	ByteStreamPtr getBSSourceDataField();
 		
@@ -242,6 +239,9 @@ public:
 	
 protected:
 	
+	///Get the the variable part of the source data field as a ByteStream that contains the data
+	ByteStreamPtr getBSData();
+	
 	/// This is the ByteStream generated with generateStream().
     ByteStreamPtr packet_output;
 	
diff --git a/src/Packet.cpp b/src/Packet.cpp
index 83a417f5c868b2cd4b88376b1d36e04842fbef77..afc0f1762611462b78aba6403b239c0d39950f16 100644
--- a/src/Packet.cpp
+++ b/src/Packet.cpp
@@ -869,7 +869,7 @@ ByteStreamPtr Packet::getBSSourceDataFieldsVariablePart() {
 	return sdff;
 }
 
-ByteStreamPtr Packet::getData() {
+ByteStreamPtr Packet::getBSData() {
 	return getBSSourceDataFieldsVariablePart();
 }
 
@@ -1031,7 +1031,7 @@ PartOfPacket* Packet::getPacketTail() {
 	return dataField->getPacketTail();
 }
 
-ByteStreamPtr Packet::decompressData() {
+ByteStreamPtr Packet::getData() {
 	//ALGORITHM FOR AUTOMATIC DECOMPRESSION: NOT IMPLEMENTED NOW. TODO
 	//decompression algorithm here
 	//1) get the fixed and variable part of the source data field, get the tail
@@ -1043,8 +1043,8 @@ ByteStreamPtr Packet::decompressData() {
 	
 	//DECOMPRESS ONLY THE DATA
 	if(!isCompressed())
-		return getData();
-	ByteStreamPtr compressed = getData();
+		return getBSData();
+	ByteStreamPtr compressed = getBSData();
 	ByteStreamPtr decompressed = compressed->decompress(getCompressionAlgorithm(), getCompressionLevel(), sizeMax());
 
 	return decompressed;