diff --git a/srslte/examples/CMakeLists.txt b/srslte/examples/CMakeLists.txt
index b8357fd05..79303ef21 100644
--- a/srslte/examples/CMakeLists.txt
+++ b/srslte/examples/CMakeLists.txt
@@ -24,17 +24,17 @@
 #################################################################
 
 add_executable(synch_file synch_file.c)
-target_link_libraries(synch_file srslte)
+target_link_libraries(synch_file srslte_phy)
 
 #################################################################
 # These can be compiled without UHD or graphics support
 #################################################################
 
 add_executable(pdsch_ue pdsch_ue.c)
-target_link_libraries(pdsch_ue srslte pthread)
+target_link_libraries(pdsch_ue srslte_phy pthread)
 
 add_executable(pdsch_enodeb pdsch_enodeb.c)
-target_link_libraries(pdsch_enodeb srslte pthread)
+target_link_libraries(pdsch_enodeb srslte_phy pthread)
 
 if(RF_FOUND)
 
@@ -59,19 +59,19 @@ endif(SRSGUI_FOUND)
 if(RF_FOUND)
 
   add_executable(cell_search cell_search.c)
-  target_link_libraries(cell_search srslte)
+  target_link_libraries(cell_search srslte_phy)
 
   add_executable(cell_measurement cell_measurement.c)
-  target_link_libraries(cell_measurement srslte)
+  target_link_libraries(cell_measurement srslte_phy)
 
   add_executable(usrp_capture usrp_capture.c)
-  target_link_libraries(usrp_capture srslte)
+  target_link_libraries(usrp_capture srslte_phy)
 
   add_executable(usrp_capture_sync usrp_capture_sync.c)
-  target_link_libraries(usrp_capture_sync srslte)
+  target_link_libraries(usrp_capture_sync srslte_phy)
 
   add_executable(usrp_txrx usrp_txrx.c)
-  target_link_libraries(usrp_txrx srslte)
+  target_link_libraries(usrp_txrx srslte_phy)
 
   message(STATUS "   examples will be installed.")
 
diff --git a/srslte/examples/tutorial_examples/CMakeLists.txt b/srslte/examples/tutorial_examples/CMakeLists.txt
index 04248ef9c..8228b52b1 100644
--- a/srslte/examples/tutorial_examples/CMakeLists.txt
+++ b/srslte/examples/tutorial_examples/CMakeLists.txt
@@ -26,10 +26,10 @@
 if(SRSGUI_FOUND AND UHD_FOUND)
 
   add_executable(pss pss.c)
-  target_link_libraries(pss srslte ${SRSGUI_LIBRARIES})
+  target_link_libraries(pss srslte_phy ${SRSGUI_LIBRARIES})
 
   add_executable(simple_tx simple_tx.c)
-  target_link_libraries(simple_tx srslte)
+  target_link_libraries(simple_tx srslte_phy)
 
 endif(SRSGUI_FOUND AND UHD_FOUND)
 
diff --git a/srslte/lib/phy/CMakeLists.txt b/srslte/lib/phy/CMakeLists.txt
index dfd8f875f..01b369c13 100644
--- a/srslte/lib/phy/CMakeLists.txt
+++ b/srslte/lib/phy/CMakeLists.txt
@@ -54,64 +54,64 @@ set(srslte_srcs     $<TARGET_OBJECTS:srslte_agc>
                     $<TARGET_OBJECTS:srslte_enb>
 )
 
-add_library(srslte SHARED ${srslte_srcs})
-target_link_libraries(srslte pthread m)
-set_target_properties(srslte  PROPERTIES
-                              VERSION ${SRSLTE_VERSION_MAJOR}.${SRSLTE_VERSION_MINOR})
+add_library(srslte_phy SHARED ${srslte_srcs})
+target_link_libraries(srslte_phy pthread m)
+set_target_properties(srslte_phy PROPERTIES
+                                 VERSION ${SRSLTE_VERSION_MAJOR}.${SRSLTE_VERSION_MINOR})
 
 if(NOT DisableMEX)
-  add_library(srslte_static STATIC ${srslte_srcs})
+  add_library(srslte_phy_static STATIC ${srslte_srcs})
 endif(NOT DisableMEX)
 
 if(MKL_FOUND)
   if(StaticMKL)
-    target_link_libraries(srslte ${MKL_STATIC_LIBRARIES})
+    target_link_libraries(srslte_phy ${MKL_STATIC_LIBRARIES})
     if(NOT DisableMEX)
-      target_link_libraries(srslte_static ${MKL_STATIC_LIBRARIES})
+      target_link_libraries(srslte_phy_static ${MKL_STATIC_LIBRARIES})
     endif(NOT DisableMEX)
   else(StaticMKL)
-    target_link_libraries(srslte ${MKL_LIBRARIES})
+    target_link_libraries(srslte_phy ${MKL_LIBRARIES})
     if(NOT DisableMEX)
-      target_link_libraries(srslte_static ${MKL_LIBRARIES})
+      target_link_libraries(srslte_phy_static ${MKL_LIBRARIES})
     endif(NOT DisableMEX)
   endif(StaticMKL)
 else(MKL_FOUND)
-  target_link_libraries(srslte ${FFTW3F_LIBRARIES})
+  target_link_libraries(srslte_phy ${FFTW3F_LIBRARIES})
   if(NOT DisableMEX)
-    target_link_libraries(srslte_static ${FFTW3F_LIBRARIES})
+    target_link_libraries(srslte_phy_static ${FFTW3F_LIBRARIES})
   endif(NOT DisableMEX)
 endif(MKL_FOUND)
 
 ## This linkage is required for the examples and tests only
 if(RF_FOUND)
 
-  target_link_libraries(srslte srslte_rf)
+  target_link_libraries(srslte_phy srslte_rf)
 
   if(UHD_FOUND)
-    target_link_libraries(srslte ${UHD_LIBRARIES})
+    target_link_libraries(srslte_phy ${UHD_LIBRARIES})
   endif(UHD_FOUND)
 
   if(BLADERF_FOUND)
-    target_link_libraries(srslte ${BLADERF_LIBRARIES})
+    target_link_libraries(srslte_phy ${BLADERF_LIBRARIES})
   endif(BLADERF_FOUND)
 
   if(LIMESDR_FOUND)
-    target_link_libraries(srslte ${LIMESDR_LIBRARIES})
+    target_link_libraries(srslte_phy ${LIMESDR_LIBRARIES})
   endif(LIMESDR_FOUND)
 
   if(SOAPYSDR_FOUND)
-    target_link_libraries(srslte ${SOAPYSDR_LIBRARIES})
+    target_link_libraries(srslte_phy ${SOAPYSDR_LIBRARIES})
   endif(SOAPYSDR_FOUND)
 
 endif(RF_FOUND)
 
 if(VOLK_FOUND)
-  target_link_libraries(srslte ${VOLK_LIBRARIES})
+  target_link_libraries(srslte_phy ${VOLK_LIBRARIES})
   if(NOT DisableMEX)
-    target_link_libraries(srslte_static ${VOLK_LIBRARIES})
+    target_link_libraries(srslte_phy_static ${VOLK_LIBRARIES})
   endif(NOT DisableMEX)
 endif(VOLK_FOUND)
 
-INSTALL(TARGETS srslte DESTINATION ${LIBRARY_DIR})
-SRSLTE_SET_PIC(srslte)
+INSTALL(TARGETS srslte_phy DESTINATION ${LIBRARY_DIR})
+SRSLTE_SET_PIC(srslte_phy)
 
diff --git a/srslte/lib/phy/ch_estimation/test/CMakeLists.txt b/srslte/lib/phy/ch_estimation/test/CMakeLists.txt
index 84b66b3aa..9b64f8e92 100644
--- a/srslte/lib/phy/ch_estimation/test/CMakeLists.txt
+++ b/srslte/lib/phy/ch_estimation/test/CMakeLists.txt
@@ -23,7 +23,7 @@
 ########################################################################
 
 add_executable(chest_test_dl chest_test_dl.c)
-target_link_libraries(chest_test_dl srslte)
+target_link_libraries(chest_test_dl srslte_phy)
 
 add_test(chest_test_dl_cellid0 chest_test_dl -c 0) 
 add_test(chest_test_dl_cellid1 chest_test_dl -c 1) 
@@ -39,10 +39,10 @@ add_test(chest_test_dl_cellid2 chest_test_dl -c 2 -r 50)
 ########################################################################
 
 add_executable(chest_test_ul chest_test_ul.c)
-target_link_libraries(chest_test_ul srslte)
+target_link_libraries(chest_test_ul srslte_phy)
 
 add_executable(refsignal_ul_test_all refsignal_ul_test.c)
-target_link_libraries(refsignal_ul_test_all srslte)
+target_link_libraries(refsignal_ul_test_all srslte_phy)
 
 add_test(chest_test_ul_cellid0 chest_test_ul -c 0 -r 50) 
 add_test(chest_test_ul_cellid1 chest_test_ul -c 1 -r 50) 
diff --git a/srslte/lib/phy/dft/test/CMakeLists.txt b/srslte/lib/phy/dft/test/CMakeLists.txt
index 0fc781cfd..650d5a192 100644
--- a/srslte/lib/phy/dft/test/CMakeLists.txt
+++ b/srslte/lib/phy/dft/test/CMakeLists.txt
@@ -23,7 +23,7 @@
 ########################################################################
 
 add_executable(ofdm_test ofdm_test.c)
-target_link_libraries(ofdm_test srslte)
+target_link_libraries(ofdm_test srslte_phy)
 
 add_test(ofdm_normal ofdm_test) 
 add_test(ofdm_extended ofdm_test -e) 
diff --git a/srslte/lib/phy/fec/test/CMakeLists.txt b/srslte/lib/phy/fec/test/CMakeLists.txt
index 52d653150..e8da4a1b4 100644
--- a/srslte/lib/phy/fec/test/CMakeLists.txt
+++ b/srslte/lib/phy/fec/test/CMakeLists.txt
@@ -24,10 +24,10 @@
 ########################################################################
 
 add_executable(rm_conv_test rm_conv_test.c)
-target_link_libraries(rm_conv_test srslte)
+target_link_libraries(rm_conv_test srslte_phy)
 
 add_executable(rm_turbo_test rm_turbo_test.c)
-target_link_libraries(rm_turbo_test srslte)
+target_link_libraries(rm_turbo_test srslte_phy)
 
 add_test(rm_conv_test_1 rm_conv_test -t 480 -r 1920) 
 add_test(rm_conv_test_2 rm_conv_test -t 1920 -r 480) 
@@ -39,7 +39,7 @@ add_test(rm_turbo_test_2 rm_turbo_test -e 8192)
 # Turbo Coder TEST  
 ########################################################################
 add_executable(turbodecoder_test turbodecoder_test.c)
-target_link_libraries(turbodecoder_test srslte)
+target_link_libraries(turbodecoder_test srslte_phy)
 
 add_test(turbodecoder_test_504_1 turbodecoder_test -n 100 -s 1 -l 504 -e 1.0 -t) 
 add_test(turbodecoder_test_504_2 turbodecoder_test -n 100 -s 1 -l 504 -e 2.0 -t) 
@@ -47,7 +47,7 @@ add_test(turbodecoder_test_6114_1_5 turbodecoder_test -n 100 -s 1 -l 6144 -e 1.5
 add_test(turbodecoder_test_known turbodecoder_test -n 1 -s 1 -k -e 0.5)  
 
 add_executable(turbocoder_test turbocoder_test.c)
-target_link_libraries(turbocoder_test srslte)
+target_link_libraries(turbocoder_test srslte_phy)
 add_test(turbocoder_test_all turbocoder_test)
 
 ########################################################################
@@ -55,7 +55,7 @@ add_test(turbocoder_test_all turbocoder_test)
 ########################################################################
 
 add_executable(viterbi_test viterbi_test.c)
-target_link_libraries(viterbi_test srslte)
+target_link_libraries(viterbi_test srslte_phy)
 
 add_test(viterbi_40_0 viterbi_test -n 1000 -s 1 -l 40 -t -e 0.0) 
 add_test(viterbi_40_2 viterbi_test -n 1000 -s 1 -l 40 -t -e 2.0) 
@@ -72,7 +72,7 @@ add_test(viterbi_1000_4 viterbi_test -n 100 -s 1 -l 1000 -t -e 4.5)
 ########################################################################
 
 add_executable(crc_test crc_test.c)
-target_link_libraries(crc_test srslte)
+target_link_libraries(crc_test srslte_phy)
 
 add_test(crc_24A crc_test -n 5001 -l 24 -p 0x1864CFB -s 1)
 add_test(crc_24B crc_test -n 5001 -l 24 -p 0x1800063 -s 1)
diff --git a/srslte/lib/phy/mimo/test/CMakeLists.txt b/srslte/lib/phy/mimo/test/CMakeLists.txt
index 9fe369779..fc385a1a5 100644
--- a/srslte/lib/phy/mimo/test/CMakeLists.txt
+++ b/srslte/lib/phy/mimo/test/CMakeLists.txt
@@ -23,7 +23,7 @@
 ########################################################################
 
 add_executable(layermap_test layermap_test.c)
-target_link_libraries(layermap_test srslte)
+target_link_libraries(layermap_test srslte_phy)
 
 add_test(layermap_single layermap_test -n 1000 -m single -c 1 -l 1) 
 
@@ -46,7 +46,7 @@ add_test(layermap_multiplex_24 layermap_test -n 1000 -m multiplex -c 2 -l 4)
 ########################################################################
  
 add_executable(precoding_test precoder_test.c)
-target_link_libraries(precoding_test srslte)
+target_link_libraries(precoding_test srslte_phy)
 
 add_test(precoding_single precoding_test -n 1000 -m single) 
 add_test(precoding_diversity2 precoding_test -n 1000 -m diversity -l 2 -p 2) 
diff --git a/srslte/lib/phy/modem/test/CMakeLists.txt b/srslte/lib/phy/modem/test/CMakeLists.txt
index f3bff6175..b8cfda6ba 100644
--- a/srslte/lib/phy/modem/test/CMakeLists.txt
+++ b/srslte/lib/phy/modem/test/CMakeLists.txt
@@ -23,7 +23,7 @@
 ########################################################################
 
 add_executable(modem_test modem_test.c)
-target_link_libraries(modem_test srslte)
+target_link_libraries(modem_test srslte_phy)
 
 add_test(modem_bpsk modem_test -n 1024 -m 1) 
 add_test(modem_qpsk modem_test -n 1024 -m 2)
@@ -36,7 +36,7 @@ add_test(modem_qam16_soft modem_test -n 1024 -m 4)
 add_test(modem_qam64_soft modem_test -n 1008 -m 6)
  
 add_executable(soft_demod_test soft_demod_test.c)
-target_link_libraries(soft_demod_test srslte)
+target_link_libraries(soft_demod_test srslte_phy)
 
  
 
diff --git a/srslte/lib/phy/phch/test/CMakeLists.txt b/srslte/lib/phy/phch/test/CMakeLists.txt
index b4b7e0836..a662377af 100644
--- a/srslte/lib/phy/phch/test/CMakeLists.txt
+++ b/srslte/lib/phy/phch/test/CMakeLists.txt
@@ -23,7 +23,7 @@
 ########################################################################
 
 add_executable(pbch_test pbch_test.c)
-target_link_libraries(pbch_test srslte)
+target_link_libraries(pbch_test srslte_phy)
 
 add_test(pbch_test_6 pbch_test -p 1 -n 6 -c 100) 
 add_test(pbch_test_62 pbch_test -p 2 -n 6 -c 100) 
@@ -38,7 +38,7 @@ add_test(pbch_test_504 pbch_test -p 4 -n 50 -c 50)
 ########################################################################
 
 add_executable(pcfich_test pcfich_test.c)
-target_link_libraries(pcfich_test srslte)
+target_link_libraries(pcfich_test srslte_phy)
 
 add_test(pcfich_test_6 pcfich_test -p 1 -n 6) 
 add_test(pcfich_test_62 pcfich_test -p 2 -n 6) 
@@ -52,7 +52,7 @@ add_test(pcfich_test_104 pcfich_test -p 4 -n 10)
 ########################################################################
 
 add_executable(phich_test phich_test.c)
-target_link_libraries(phich_test srslte)
+target_link_libraries(phich_test srslte_phy)
 
 add_test(phich_test_6 phich_test -p 1 -n 6) 
 add_test(phich_test_62 phich_test -p 2 -n 6) 
@@ -71,7 +71,7 @@ add_test(phich_test_104 phich_test -p 4 -n 10 -e -l -g 1/2)
 ########################################################################
 
 add_executable(pdcch_test pdcch_test.c)
-target_link_libraries(pdcch_test srslte)
+target_link_libraries(pdcch_test srslte_phy)
 
 add_test(pdcch_test pdcch_test) 
 
@@ -80,7 +80,7 @@ add_test(pdcch_test pdcch_test)
 ########################################################################
 
 add_executable(pdsch_test pdsch_test.c)
-target_link_libraries(pdsch_test srslte)
+target_link_libraries(pdsch_test srslte_phy)
 
 add_test(pdsch_test_qpsk pdsch_test -m 10 -n 50 -r 1)
 add_test(pdsch_test_qam16 pdsch_test -m 20 -n 100)
@@ -92,19 +92,19 @@ add_test(pdsch_test_qam64 pdsch_test -m 28 -n 100)
 ########################################################################
 
 add_executable(pbch_file_test pbch_file_test.c)
-target_link_libraries(pbch_file_test srslte)
+target_link_libraries(pbch_file_test srslte_phy)
 
 add_executable(pcfich_file_test pcfich_file_test.c)
-target_link_libraries(pcfich_file_test srslte)
+target_link_libraries(pcfich_file_test srslte_phy)
 
 add_executable(phich_file_test phich_file_test.c)
-target_link_libraries(phich_file_test srslte)
+target_link_libraries(phich_file_test srslte_phy)
 
 add_executable(pdcch_file_test pdcch_file_test.c)
-target_link_libraries(pdcch_file_test srslte)
+target_link_libraries(pdcch_file_test srslte_phy)
 
 add_executable(pdsch_pdcch_file_test pdsch_pdcch_file_test.c)
-target_link_libraries(pdsch_pdcch_file_test srslte)
+target_link_libraries(pdsch_pdcch_file_test srslte_phy)
 
 add_test(pbch_file_test pbch_file_test -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.1.92M.dat) 
 add_test(pcfich_file_test pcfich_file_test -c 150 -n 50 -p 2 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.10M.dat) 
@@ -117,7 +117,7 @@ add_test(pdsch_pdcch_file_test pdsch_pdcch_file_test -c 1 -f 3 -n 6 -p 1 -i ${CM
 ########################################################################
 
 add_executable(pusch_test pusch_test.c)
-target_link_libraries(pusch_test srslte)
+target_link_libraries(pusch_test srslte_phy)
 
 add_test(pusch_test pusch_test)
 
@@ -126,7 +126,7 @@ add_test(pusch_test pusch_test)
 ########################################################################
 
 add_executable(pucch_test pucch_test.c)
-target_link_libraries(pucch_test srslte)
+target_link_libraries(pucch_test srslte_phy)
 
 add_test(pucch_test pucch_test)
 
@@ -135,7 +135,7 @@ add_test(pucch_test pucch_test)
 ########################################################################
 
 add_executable(prach_test prach_test.c)
-target_link_libraries(prach_test srslte)
+target_link_libraries(prach_test srslte_phy)
 
 add_test(prach prach_test)
 
@@ -159,7 +159,7 @@ add_test(prach_zc2 prach_test -z 2)
 add_test(prach_zc3 prach_test -z 3)
  
 add_executable(prach_test_multi prach_test_multi.c)
-target_link_libraries(prach_test_multi srslte)
+target_link_libraries(prach_test_multi srslte_phy)
 
 add_test(prach_test_multi prach_test_multi)
 
@@ -171,5 +171,5 @@ add_test(prach_test_multi_n4 prach_test_multi -n 4)
 
 if(UHD_FOUND)
   add_executable(prach_test_usrp prach_test_usrp.c)
-  target_link_libraries(prach_test_usrp srslte pthread)
+  target_link_libraries(prach_test_usrp srslte_phy pthread)
 endif(UHD_FOUND)
diff --git a/srslte/lib/phy/resampling/test/CMakeLists.txt b/srslte/lib/phy/resampling/test/CMakeLists.txt
index 058b4cbdd..9dc03c384 100644
--- a/srslte/lib/phy/resampling/test/CMakeLists.txt
+++ b/srslte/lib/phy/resampling/test/CMakeLists.txt
@@ -23,10 +23,10 @@
 ########################################################################
 
 add_executable(resample_arb_test resample_arb_test.c)
-target_link_libraries(resample_arb_test srslte)
+target_link_libraries(resample_arb_test srslte_phy)
 
 add_executable(resample_arb_bench resample_arb_bench.c)
-target_link_libraries(resample_arb_bench srslte)
+target_link_libraries(resample_arb_bench srslte_phy)
 
 add_test(resample resample_arb_test)
  
diff --git a/srslte/lib/phy/scrambling/test/CMakeLists.txt b/srslte/lib/phy/scrambling/test/CMakeLists.txt
index 4f658e31f..67b8f4346 100644
--- a/srslte/lib/phy/scrambling/test/CMakeLists.txt
+++ b/srslte/lib/phy/scrambling/test/CMakeLists.txt
@@ -23,7 +23,7 @@
 ########################################################################
 
 add_executable(scrambling_test scrambling_test.c)
-target_link_libraries(scrambling_test srslte)
+target_link_libraries(scrambling_test srslte_phy)
 
 add_test(scrambling_pbch_bit scrambling_test -s PBCH -c 50) 
 add_test(scrambling_pbch_float scrambling_test -s PBCH -c 50 -f) 
diff --git a/srslte/lib/phy/sync/test/CMakeLists.txt b/srslte/lib/phy/sync/test/CMakeLists.txt
index c39d7978c..bd94df477 100644
--- a/srslte/lib/phy/sync/test/CMakeLists.txt
+++ b/srslte/lib/phy/sync/test/CMakeLists.txt
@@ -25,11 +25,11 @@ find_package(SRSGUI)
 ########################################################################
 
 add_executable(pss_file pss_file.c)
-target_link_libraries(pss_file srslte)
+target_link_libraries(pss_file srslte_phy)
 
 if(UHD_FOUND)
   add_executable(pss_usrp pss_usrp.c)
-  target_link_libraries(pss_usrp srslte)  
+  target_link_libraries(pss_usrp srslte_phy)
 endif(UHD_FOUND)
 
 
@@ -48,7 +48,7 @@ endif(SRSGUI_FOUND)
 ########################################################################
 
 add_executable(sync_test sync_test.c)
-target_link_libraries(sync_test srslte)
+target_link_libraries(sync_test srslte_phy)
 
 add_test(sync_test_100 sync_test -o 100 -c 501)
 add_test(sync_test_400 sync_test -o 400 -c 2)
@@ -65,7 +65,7 @@ add_test(sync_test_400_e sync_test -o 400 -e -p 50 -c 123)
 ########################################################################
 
 add_executable(cfo_test cfo_test.c)
-target_link_libraries(cfo_test srslte)
+target_link_libraries(cfo_test srslte_phy)
 
 add_test(cfo_test_1 cfo_test -f 0.12345 -n 1000)
 add_test(cfo_test_2 cfo_test -f 0.99849 -n 1000)
diff --git a/srslte/lib/phy/utils/test/CMakeLists.txt b/srslte/lib/phy/utils/test/CMakeLists.txt
index 611d40fad..42bd5031d 100644
--- a/srslte/lib/phy/utils/test/CMakeLists.txt
+++ b/srslte/lib/phy/utils/test/CMakeLists.txt
@@ -23,7 +23,7 @@
 ########################################################################
 
 add_executable(dft_test dft_test.c)
-target_link_libraries(dft_test srslte)
+target_link_libraries(dft_test srslte_phy)
 
 add_test(dft_test dft_test)
 add_test(dft_reverse dft_test -b) # Backwards first