diff --git a/algo/data/CMakeLists.txt b/algo/data/CMakeLists.txt
index aa0750728d19f7ae543399251303f2c573ac9fc3..80dcea0ff791678e8e64f9b92c65c4bac48bd966 100644
--- a/algo/data/CMakeLists.txt
+++ b/algo/data/CMakeLists.txt
@@ -40,7 +40,7 @@ target_include_directories(OnlineData
   PUBLIC ${CMAKE_SOURCE_DIR}/core/data/psd
   PUBLIC ${CMAKE_SOURCE_DIR}/core/data/global
   PUBLIC ${CMAKE_SOURCE_DIR}/core/data/raw
-  PUBLIC ${CMAKE_SOURCE_DIR}/external/ipc/ipc/lib/fles_ipc
+  PUBLIC ${CMAKE_SOURCE_DIR}/external/fles/flesnet/lib/fles_ipc
 )
 
 target_include_directories(OnlineData SYSTEM
diff --git a/algo/test/CMakeLists.txt b/algo/test/CMakeLists.txt
index 04f7c81c4e90aac3161c342be29e66822fbfe607..5204a056dcce198de7c4f3b1829dacb0171cd926 100644
--- a/algo/test/CMakeLists.txt
+++ b/algo/test/CMakeLists.txt
@@ -31,7 +31,7 @@ Set(INCLUDE_DIRECTORIES
   ${CBMDATA_DIR}/much
   ${CBMDATA_DIR}/psd
   ${CBMDATA_DIR}/trd
-  ${CMAKE_SOURCE_DIR}/external/ipc/ipc/lib/fles_ipc
+  ${CMAKE_SOURCE_DIR}/external/fles/flesnet/lib/fles_ipc
   ${CMAKE_SOURCE_DIR}/algo
   ${CMAKE_SOURCE_DIR}/algo/trigger
   ${CMAKE_SOURCE_DIR}/algo/evbuild
diff --git a/core/data/CMakeLists.txt b/core/data/CMakeLists.txt
index 92828e5113ce98dd85d64cb9e1e5d002423f3e5f..bcd290d07a1445ac03682fab5c6c66bca79c373e 100644
--- a/core/data/CMakeLists.txt
+++ b/core/data/CMakeLists.txt
@@ -14,7 +14,7 @@ set(INCLUDE_DIRECTORIES
   ${CMAKE_CURRENT_SOURCE_DIR}/rich
   ${CMAKE_CURRENT_SOURCE_DIR}/psd
   ${CMAKE_CURRENT_SOURCE_DIR}/global
-  ${CMAKE_SOURCE_DIR}/external/ipc/ipc/lib/fles_ipc
+  ${CMAKE_SOURCE_DIR}/external/fles/flesnet/lib/fles_ipc
 )
 include_directories( ${INCLUDE_DIRECTORIES})
 
diff --git a/core/data/test/CMakeLists.txt b/core/data/test/CMakeLists.txt
index e1f40094d41f4e71df753000ffd3c0bb02e551c7..826e045b52b0ed454b8a5ab1905639763fcb9ae8 100644
--- a/core/data/test/CMakeLists.txt
+++ b/core/data/test/CMakeLists.txt
@@ -35,7 +35,7 @@ Set(INCLUDE_DIRECTORIES
   ${CBMDATA_DIR}/much
   ${CBMDATA_DIR}/test/sts
   ${CBMDATA_DIR}/test/global
-  ${CMAKE_SOURCE_DIR}/external/ipc/ipc/lib/fles_ipc
+  ${CMAKE_SOURCE_DIR}/external/fles/flesnet/lib/fles_ipc
   ${BASE_INCLUDE_DIRECTORIES}
   ${GTEST_INCLUDE_DIR}
 )
diff --git a/core/data/test/global/CMakeLists.txt b/core/data/test/global/CMakeLists.txt
index eeaa12a889a641714a24534b025dccbcda58d068..c105658806cad09899989155cbd5c5814dc135a1 100644
--- a/core/data/test/global/CMakeLists.txt
+++ b/core/data/test/global/CMakeLists.txt
@@ -13,7 +13,7 @@ Set(INCLUDE_DIRECTORIES
   ${CBMDATA_DIR}/trd
   ${CBMDATA_DIR}/mvd
   ${CBMDATA_DIR}/test/sts
-  ${CMAKE_SOURCE_DIR}/external/ipc/ipc/lib/fles_ipc
+  ${CMAKE_SOURCE_DIR}/external/fles/flesnet/lib/fles_ipc
   ${BASE_INCLUDE_DIRECTORIES}
   ${GTEST_INCLUDE_DIR}
 )
diff --git a/external/.gitignore b/external/.gitignore
index 4a453a0ecbe8b30b0dd706ce7432acbcb1295b80..8a58b186acde9dba307089f00e6e106710fee232 100644
--- a/external/.gitignore
+++ b/external/.gitignore
@@ -5,7 +5,7 @@ NicaFemto
 Vc
 cppzmq
 flib_dpb/flib_dpb
-ipc/ipc
+fles/flesnet
 jsroot
 googletest
 yaml-cpp/
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 4d104091868e32b6cfccbeee2bad1b576baa1aa3..5d9190078b379c5c551e86715d77fd9be5959778 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -17,10 +17,10 @@ if(DOWNLOAD_EXTERNALS)
   install(FILES cppzmq/zmq.hpp DESTINATION include)
 
 
-  Set(IPC_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ipc/ipc/lib/fles_ipc PARENT_SCOPE)
-  Set(IPCLOG_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ipc/ipc/lib/logging PARENT_SCOPE)
+  Set(IPC_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/fles/flesnet/lib/fles_ipc PARENT_SCOPE)
+  Set(IPCLOG_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/fles/flesnet/lib/logging PARENT_SCOPE)
 
-  Add_Subdirectory(ipc)
+  Add_Subdirectory(fles)
   Add_Subdirectory(flib_dpb)
 
   find_package(Vc 1.4.1)
diff --git a/external/ipc/CMakeLists.txt b/external/fles/CMakeLists.txt
similarity index 68%
rename from external/ipc/CMakeLists.txt
rename to external/fles/CMakeLists.txt
index 569ee956681c8b97970196409e78addd29745456..23a86ac14bdba02891e9bb1849a7ba55cd9d5d27 100644
--- a/external/ipc/CMakeLists.txt
+++ b/external/fles/CMakeLists.txt
@@ -3,16 +3,16 @@
 # This library provides the interface to the experiment data in timeslices
 # both online as delivered by flesnet and to timeslice archive (.tsa) files.
 
-download_project_if_needed(PROJECT         fles_ipc
+download_project_if_needed(PROJECT         flesnet
                            GIT_REPOSITORY  "https://github.com/cbm-fles/flesnet"
                            GIT_TAG         "301000b321eb7bc3a47a79b2ceadf2aa844327fe"
                            GIT_STASH       TRUE
-                           SOURCE_DIR      ${CMAKE_CURRENT_SOURCE_DIR}/ipc
+                           SOURCE_DIR      ${CMAKE_CURRENT_SOURCE_DIR}/flesnet
                            TEST_FILE       CMakeLists.txt
                            )
 
 # Create the logging library
-add_library(fles_logging SHARED ipc/lib/logging/log.cpp ipc/lib/logging/log.hpp)
+add_library(fles_logging SHARED flesnet/lib/logging/log.cpp flesnet/lib/logging/log.hpp)
 
 target_compile_definitions(fles_logging
   PUBLIC BOOST_LOG_DYN_LINK
@@ -20,7 +20,7 @@ target_compile_definitions(fles_logging
   PUBLIC BOOST_ERROR_CODE_HEADER_ONLY
 )
 
-target_include_directories(fles_logging PUBLIC ipc/lib/logging/)
+target_include_directories(fles_logging PUBLIC flesnet/lib/logging/)
 
 target_include_directories(fles_logging SYSTEM PUBLIC ${Boost_INCLUDE_DIRS})
 
@@ -37,8 +37,8 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
   ${Boost_INCLUDE_DIR}
   ${ZMQ_INCLUDE_DIR}
   ${CMAKE_SOURCE_DIR}/external/cppzmq
-  ${CMAKE_SOURCE_DIR}/external/ipc/ipc
-  ${CMAKE_SOURCE_DIR}/external/ipc/ipc/lib/logging
+  ${CMAKE_SOURCE_DIR}/external/fles/flesnet
+  ${CMAKE_SOURCE_DIR}/external/fles/flesnet/lib/logging
 )
 
 Include_Directories( ${INCLUDE_DIRECTORIES})
@@ -54,19 +54,19 @@ Set(LINK_DIRECTORIES
 Link_Directories( ${LINK_DIRECTORIES})
 
 Set(SRCS
-ipc/lib/fles_ipc/Microslice.cpp
-ipc/lib/fles_ipc/MicrosliceView.cpp
-ipc/lib/fles_ipc/StorableMicroslice.cpp
-ipc/lib/fles_ipc/StorableTimeslice.cpp
-ipc/lib/fles_ipc/System.cpp
-ipc/lib/fles_ipc/Timeslice.cpp
-ipc/lib/fles_ipc/TimeslicePublisher.cpp
-ipc/lib/fles_ipc/TimesliceReceiver.cpp
-ipc/lib/fles_ipc/TimesliceSubscriber.cpp
-ipc/lib/fles_ipc/TimesliceView.cpp
-ipc/lib/fles_ipc/TimesliceMultiInputArchive.cpp
-ipc/lib/fles_ipc/TimesliceMultiSubscriber.cpp
-ipc/lib/fles_ipc/TimesliceAutoSource.cpp
+flesnet/lib/fles_ipc/Microslice.cpp
+flesnet/lib/fles_ipc/MicrosliceView.cpp
+flesnet/lib/fles_ipc/StorableMicroslice.cpp
+flesnet/lib/fles_ipc/StorableTimeslice.cpp
+flesnet/lib/fles_ipc/System.cpp
+flesnet/lib/fles_ipc/Timeslice.cpp
+flesnet/lib/fles_ipc/TimeslicePublisher.cpp
+flesnet/lib/fles_ipc/TimesliceReceiver.cpp
+flesnet/lib/fles_ipc/TimesliceSubscriber.cpp
+flesnet/lib/fles_ipc/TimesliceView.cpp
+flesnet/lib/fles_ipc/TimesliceMultiInputArchive.cpp
+flesnet/lib/fles_ipc/TimesliceMultiSubscriber.cpp
+flesnet/lib/fles_ipc/TimesliceAutoSource.cpp
 )
 
 
@@ -83,6 +83,6 @@ EndIf()
 GENERATE_LIBRARY()
 
 # Install header files
-install(FILES ipc/lib/logging/log.hpp DESTINATION include)
-file(GLOB_RECURSE IPC_HEADERS ipc/lib/fles_ipc/*.hpp)
+install(FILES flesnet/lib/logging/log.hpp DESTINATION include)
+file(GLOB_RECURSE IPC_HEADERS flesnet/lib/fles_ipc/*.hpp)
 install(FILES ${IPC_HEADERS} DESTINATION include)