diff --git a/srsenb/hdr/stack/mac/mac_nr.h b/srsenb/hdr/stack/mac/mac_nr.h
index 0bb65bc14..920c9cb2c 100644
--- a/srsenb/hdr/stack/mac/mac_nr.h
+++ b/srsenb/hdr/stack/mac/mac_nr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 Software Radio Systems Limited
+ * Copyright 2013-2020 Software Radio Systems Limited
  *
  * This file is part of srsLTE.
  *
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef SRSGNB_MAC_NR_H
-#define SRSGNB_MAC_NR_H
+#ifndef SRSENB_MAC_NR_H
+#define SRSENB_MAC_NR_H
 
 #include "srslte/common/logmap.h"
 #include "srslte/common/mac_nr_pcap.h"
@@ -107,4 +107,4 @@ private:
 
 } // namespace srsenb
 
-#endif // SRSGNB_MAC_NR_H
\ No newline at end of file
+#endif // SRSENB_MAC_NR_H
\ No newline at end of file
diff --git a/srsenb/src/stack/mac/mac_nr.cc b/srsenb/src/stack/mac/mac_nr.cc
index 7b7b196cf..17609a0db 100644
--- a/srsenb/src/stack/mac/mac_nr.cc
+++ b/srsenb/src/stack/mac/mac_nr.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 Software Radio Systems Limited
+ * Copyright 2013-2020 Software Radio Systems Limited
  *
  * This file is part of srsLTE.
  *
@@ -19,13 +19,9 @@
  *
  */
 
-#define Error(fmt, ...) log_h->error(fmt, ##__VA_ARGS__)
-#define Warning(fmt, ...) log_h->warning(fmt, ##__VA_ARGS__)
-#define Info(fmt, ...) log_h->info(fmt, ##__VA_ARGS__)
-#define Debug(fmt, ...) log_h->debug(fmt, ##__VA_ARGS__)
-
 #include "srsenb/hdr/stack/mac/mac_nr.h"
 #include "srslte/common/buffer_pool.h"
+#include "srslte/common/log_helper.h"
 #include <pthread.h>
 #include <string.h>
 #include <strings.h>
diff --git a/srsue/src/stack/mac/mac_nr.cc b/srsue/src/stack/mac/mac_nr.cc
index 7972e0e37..3ee774772 100644
--- a/srsue/src/stack/mac/mac_nr.cc
+++ b/srsue/src/stack/mac/mac_nr.cc
@@ -19,12 +19,8 @@
  *
  */
 
-#define Error(fmt, ...) log_h->error(fmt, ##__VA_ARGS__)
-#define Warning(fmt, ...) log_h->warning(fmt, ##__VA_ARGS__)
-#define Info(fmt, ...) log_h->info(fmt, ##__VA_ARGS__)
-#define Debug(fmt, ...) log_h->debug(fmt, ##__VA_ARGS__)
-
 #include "srsue/hdr/stack/mac/mac_nr.h"
+#include "srslte/common/log_helper.h"
 
 using namespace asn1::rrc;