diff --git a/javasrc/tool/org/etsi/its/tool/elvior/LibItsMapemSpatem_asn1.java b/javasrc/tool/org/etsi/its/tool/elvior/LibItsMapemSpatem_asn1.java
index d77bb17c8a10520e4dc202b78bc4a1a4cf2a6e0f..c3e85e8549c205aa1b4a0724ab2b1c8d9476587a 100644
--- a/javasrc/tool/org/etsi/its/tool/elvior/LibItsMapemSpatem_asn1.java
+++ b/javasrc/tool/org/etsi/its/tool/elvior/LibItsMapemSpatem_asn1.java
@@ -24,10 +24,10 @@ public class LibItsMapemSpatem_asn1 extends LibIts_asn1 {
     public Value decode(final TriMessage message, final Type decodingHypothesis) {
         _logger.entering("LibItsMapemSpatem_asn1", "decode", decodingHypothesis.getName());
         
-        if (decodingHypothesis.getName().endsWith("mapemPacket")) {
+        if (decodingHypothesis.getName().endsWith("MAPEM")) {
             Type type = getTypeForName("MAPEM_PDU_Descriptions.MAPEM");
             return super.decode(message, type);
-        } else if (decodingHypothesis.getName().endsWith("spatemPacket")) {
+        } else if (decodingHypothesis.getName().endsWith("SPATEM")) {
             Type type = getTypeForName("SPATEM_PDU_Descriptions.SPATEM");
             return super.decode(message, type);
         }
diff --git a/javasrc/tool/org/etsi/its/tool/elvior/LibIts_asn1.java b/javasrc/tool/org/etsi/its/tool/elvior/LibIts_asn1.java
index a41f7768a7fb53dc2daaa1c7f98f7e2849dd74dc..2d85d8b7257de835a8abf9caba8af1a1dc1a898b 100644
--- a/javasrc/tool/org/etsi/its/tool/elvior/LibIts_asn1.java
+++ b/javasrc/tool/org/etsi/its/tool/elvior/LibIts_asn1.java
@@ -59,7 +59,16 @@ public class LibIts_asn1 implements TciCDProvided {
         msg.setEncodedMessage(message.getEncodedMessage());
         if (_logger.isLoggable(Level.ALL)) ByteHelper.dump("LibIts_asn1.decode: ", msg.getEncodedMessage());
         
-        String type = String.format("%s.%s", _encodingName, decodingHypothesis.getName());
+        String type = null;
+        if (_encodingName.equals("MAPEM_SPATEM_ETSI")) {
+            if (decodingHypothesis.getName().endsWith("MAPEM")) {
+                type = String.format("%s.%s", "MAPEM_PDU_Descriptions", decodingHypothesis.getName());
+            } else {
+                type = String.format("%s.%s", "SPATEM_PDU_Descriptions", decodingHypothesis.getName());
+            }
+        } else {
+            type = String.format("%s.%s", _encodingName, decodingHypothesis.getName());
+        }
         _logger.info("Type: " + type);
         Type asnOriginalType = getTypeForName(type);
         // Check which type class the decoding hypothesis is of
diff --git a/javasrc/tool/org/etsi/its/tool/elvior/res/ta.properties b/javasrc/tool/org/etsi/its/tool/elvior/res/ta.properties
index 21956164b3cc5e6e24abac94ab7d8284fefe864a..465724aabeab0abf1b7e28df89880e1859033365 100644
--- a/javasrc/tool/org/etsi/its/tool/elvior/res/ta.properties
+++ b/javasrc/tool/org/etsi/its/tool/elvior/res/ta.properties
@@ -5,7 +5,7 @@ camPort=BTP/GN/ETH
 # Define the port/layer configuration for DENM
 denmPort=BTP/GN/ETH
 # Define the port/layer configuration for MAPEM-SPATEM
-mapmSpatenmPort=BTP/GN/ETH
+mapemSpatemPort=BTP/GN/ETH
 # Define the port/layer configuration for IVIM
 ivimPort=BTP/GN/ETH
 # Define the port/layer configuration for SREM-SSEM
@@ -27,7 +27,7 @@ fsapPort=FSAP/UdpIp
 UpperTesterSettings=172.17.15.38:12345
 
 # Peer ITS station
-LinkLayer_Peer=8BADF00D0099
+LinkLayer_Peer=8BADF00D0199
 
 # Define the MAC address of the Ethernet interface connected to the IUT device
 #       Home laptop VMWare MAC address
@@ -41,15 +41,15 @@ LocalEthernetMAC=00E08F008855
 # Define the Ethernet type value used by the IUT
 IutEthernetTypeValue=0x8947
 # Node Ethernet addresses
-LinkLayer_MTC=8BADF00D0000
+LinkLayer_MTC=8BADF00D0100
 # Link-Layer address of component NodeA
-LinkLayer_NodeA=8BADF00D0001
+LinkLayer_NodeA=8BADF00D0101
 # Link-Layer address of component NodeB
-LinkLayer_NodeB=8BADF00D0002
+LinkLayer_NodeB=8BADF00D0102
 # Link-Layer address of component NodeC
-LinkLayer_NodeC=8BADF00D0003
+LinkLayer_NodeC=8BADF00D0103
 # Link-Layer address of component NodeD
-LinkLayer_NodeD=8BADF00D0004
+LinkLayer_NodeD=8BADF00D0104
 # Interval between each beacon sent by TS (ms)
 TsBeaconInterval=1000
 # Latitude of Test System