diff --git a/srsue/hdr/mac/demux.h b/srsue/hdr/mac/demux.h
index 773181220..8c9fb3a02 100644
--- a/srsue/hdr/mac/demux.h
+++ b/srsue/hdr/mac/demux.h
@@ -42,7 +42,7 @@ class demux : public srslte::pdu_queue::process_callback
 {
 public:
   demux();
-  void init(phy_interface_mac* phy_h_, rlc_interface_mac *rlc, srslte::log* log_h_, srslte::timers* timers_db_);
+  void init(phy_interface_mac_common* phy_h_, rlc_interface_mac *rlc, srslte::log* log_h_, srslte::timers* timers_db_);
 
   bool     process_pdus();
   uint8_t* request_buffer(uint32_t pid, uint32_t len);
@@ -73,10 +73,10 @@ private:
   
   bool       is_uecrid_successful; 
     
-  phy_interface_mac *phy_h; 
-  srslte::log       *log_h;
-  srslte::timers    *timers_db;
-  rlc_interface_mac *rlc;
+  phy_interface_mac_common *phy_h;
+  srslte::log              *log_h;
+  srslte::timers           *timers_db;
+  rlc_interface_mac        *rlc;
   
   // Buffer of PDUs
   srslte::pdu_queue pdus; 
diff --git a/srsue/src/mac/demux.cc b/srsue/src/mac/demux.cc
index 71ad0cc58..227bcc364 100644
--- a/srsue/src/mac/demux.cc
+++ b/srsue/src/mac/demux.cc
@@ -40,7 +40,7 @@ demux::demux() : mac_msg(20), pending_mac_msg(20)
 {
 }
 
-void demux::init(phy_interface_mac* phy_h_, rlc_interface_mac *rlc_, srslte::log* log_h_, srslte::timers* timers_db_)
+void demux::init(phy_interface_mac_common* phy_h_, rlc_interface_mac *rlc_, srslte::log* log_h_, srslte::timers* timers_db_)
 {
   phy_h     = phy_h_; 
   log_h     = log_h_;