diff --git a/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/Makefile b/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/Makefile
index fb9930899995a2fe8896cbce4cba7ae66bf1d555..8587ffcaeca3dc35d4276f45cee1362bc8bd5cad 100644
--- a/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/Makefile
+++ b/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/Makefile
@@ -7,7 +7,7 @@ PROJDIR	= $(PWD)/../..
 
 export LD_RUN_PATH = $(LIBDIR):$(LIBPROCESS)
 
-LIBS	 = -lutil -lapi -lEMMmsg -lESMmsg -lies
+LIBS	 = -lutil -lapi -lEMMmsg -lESMmsg -lies -lrt
 INCLUDES = -I. -I$(INCDIR) -I$(UTILDIR) -I$(NETAPIDIR) \
 	-I$(EMMMSGDIR) -I$(ESMMSGDIR) -I$(IESDIR)
 
diff --git a/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/as_simulator.c b/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/as_simulator.c
index c11f816ab1c79bf9e7225c1cc61dfe8742f07501..d7c978b7f2303c2312212fdadb56c6d4eebc0f39 100644
--- a/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/as_simulator.c
+++ b/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/as_simulator.c
@@ -139,7 +139,7 @@ int main (int argc, const char* argv[])
     const char* mhost = as_simulator_parser_get_mhost();
     const char* mport = as_simulator_parser_get_mport();
 
-    log_init(0x2f);
+    nas_log_init(0x2f);
 
     /*
      * Initialize the communication channel to the UE NAS process
diff --git a/openair-cn/NAS/EURECOM-NAS/tst/network/Makefile b/openair-cn/NAS/EURECOM-NAS/tst/network/Makefile
index 78a64c659a6a68da932b3d3fe7057a5a673d8f58..2ec879459fa486f77d19512aa13b1357766c2fd6 100644
--- a/openair-cn/NAS/EURECOM-NAS/tst/network/Makefile
+++ b/openair-cn/NAS/EURECOM-NAS/tst/network/Makefile
@@ -7,7 +7,7 @@ PROJDIR	= $(PWD)/../..
 
 export LD_RUN_PATH = $(LIBDIR):$(LIBPROCESS)
 
-LIBS	 = -lutil -lapi -lEMMmsg -lESMmsg -lies
+LIBS	 = -lutil -lapi -lEMMmsg -lESMmsg -lies -lrt
 INCLUDES = -I. -I$(SRCDIR) -I$(INCDIR) -I$(UTILDIR) \
 	-I$(EMMMSGDIR) -I$(ESMMSGDIR) -I$(IESDIR)
 
@@ -19,7 +19,7 @@ all: $(TARGET)
 	$(CC) $(CFLAGS) -c $< -o $@
 
 $(TARGET): $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+	$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 clean:
 	$(RM) $(OBJS) *.bak *~
diff --git a/openair-cn/NAS/EURECOM-NAS/tst/network/network_simulator.c b/openair-cn/NAS/EURECOM-NAS/tst/network/network_simulator.c
index a74a17ebb4cc369b0f4858858980621b3f970bfe..fd77ad647fa5d452affc0040e21c221c3cf26512 100644
--- a/openair-cn/NAS/EURECOM-NAS/tst/network/network_simulator.c
+++ b/openair-cn/NAS/EURECOM-NAS/tst/network/network_simulator.c
@@ -23,13 +23,13 @@ Description	Implements the network simulator running at the network
 
 #include "include/commonDef.h"
 #include "util/socket.h"
-#include "util/timer.h"
+#include "util/nas_timer.h"
 #include "api/network/as_message.h"
 #include "api/network/nas_message.h"
 #include "emm/msg/emm_cause.h"
 #include "esm/msg/esm_cause.h"
 
-#include "util/log.h"
+#include "util/nas_log.h"
 
 #include <stdio.h>	// printf, perror
 #include <errno.h>	// errno
@@ -226,7 +226,7 @@ int main (int argc, const char* argv[])
     const char* host = network_parser_get_host();
     const char* port = network_parser_get_port();
 
-    log_init(0x2f);
+    nas_log_init(0x2f);
 
     /*
      * Initialize the communication channel to the NAS sublayer