diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/epc.yang.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/epc.yang.conf
index c9232a35aec86d50cfd0b5168e4535dae51f2a86..8bbf4357902bf4c3408e65eb81153d92be8921df 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/epc.yang.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/epc.yang.conf
@@ -73,14 +73,13 @@ MME :
     NAS :
     {
         # 3GPP TS 33.401 section 7.2.4.3 Procedures for NAS algorithm selection
-        # TODO
-        ORDERED_SUPPORTED_INTEGRITY_ALGORITHM_LIST = [ "EIA2" , "EIA1" ];
-        ORDERED_SUPPORTED_CIPHERING_ALGORITHM_LIST = [ "EEA0" , "EEA2" , "EEA1" ];
+        ORDERED_SUPPORTED_INTEGRITY_ALGORITHM_LIST = [ "EIA1" , "EIA2" , "EIA0" ];
+        ORDERED_SUPPORTED_CIPHERING_ALGORITHM_LIST = [ "EEA0" , "EEA1" , "EEA2" ];
     };
     
     NETWORK_INTERFACES : 
     {
-        MME_INTERFACE_NAME_FOR_S1_MME         = "eth0";
+        MME_INTERFACE_NAME_FOR_S1_MME         = "eth1";
         MME_IPV4_ADDRESS_FOR_S1_MME           = "192.168.12.17/24";
 
         MME_INTERFACE_NAME_FOR_S11_MME        = "none";