diff --git a/producer/CMakeLists.txt b/producer/CMakeLists.txt
index 894680120f4f58a380ad1513d91e226e085d08e2..5f5aaa9376bad919676e820b96326befdee9f67d 100644
--- a/producer/CMakeLists.txt
+++ b/producer/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_subdirectory(api)
-add_subdirectory(folder_monitor_producer)
+add_subdirectory(event_monitor_producer)
diff --git a/producer/folder_monitor_producer/CMakeLists.txt b/producer/event_monitor_producer/CMakeLists.txt
similarity index 80%
rename from producer/folder_monitor_producer/CMakeLists.txt
rename to producer/event_monitor_producer/CMakeLists.txt
index b08b18073860acbd4022c9da2dcc64874c83a641..1cfcdbed87e6ebe8a37bb711157b27bc617220ee 100644
--- a/producer/folder_monitor_producer/CMakeLists.txt
+++ b/producer/event_monitor_producer/CMakeLists.txt
@@ -1,8 +1,8 @@
-set(TARGET_NAME folder-monitor-producer)
+set(TARGET_NAME event-monitor-producer)
 set(SOURCE_FILES
         src/event_detector.cpp
-        src/foldermon_config.cpp
-        src/foldermon_logger.cpp
+        src/eventmon_config.cpp
+        src/eventmon_logger.cpp
         src/event_detector_factory.cpp
         src/inotify_event_detector.cpp)
 
@@ -25,8 +25,8 @@ target_link_libraries(${TARGET_NAME} producer-api)
 ################################
 # Executable
 ################################
-add_executable(${TARGET_NAME}-bin src/foldermon_main.cpp)
-set_target_properties(${TARGET_NAME}-bin PROPERTIES OUTPUT_NAME asapo-foldermon-producer)
+add_executable(${TARGET_NAME}-bin src/eventmon_main.cpp)
+set_target_properties(${TARGET_NAME}-bin PROPERTIES OUTPUT_NAME asapo-eventmon-producer)
 target_link_libraries(${TARGET_NAME}-bin ${TARGET_NAME})
 
 set_target_properties(${TARGET_NAME}-bin PROPERTIES RUNTIME_OUTPUT_DIRECTORY
@@ -40,14 +40,14 @@ set_target_properties(${TARGET_NAME}-bin PROPERTIES RUNTIME_OUTPUT_DIRECTORY
 set_property(TARGET ${TARGET_NAME} PROPERTY ENABLE_EXPORTS true)
 
 set(TEST_SOURCE_FILES
-        unittests/test_foldermon_config.cpp
-        unittests/mock_foldermon_config.cpp
+        unittests/test_eventmon_config.cpp
+        unittests/mock_eventmon_config.cpp
         unittests/test_event_detector_factory.cpp
    )
 
 set(TEST_LIBRARIES "${TARGET_NAME}")
 
-gtest(${TARGET_NAME} "${TEST_SOURCE_FILES}" "${TEST_LIBRARIES}" ${CMAKE_CURRENT_SOURCE_DIR}/src/foldermon_main.cpp)
+gtest(${TARGET_NAME} "${TEST_SOURCE_FILES}" "${TEST_LIBRARIES}" ${CMAKE_CURRENT_SOURCE_DIR}/src/eventmon_main.cpp)
 
 install(TARGETS ${TARGET_NAME}-bin DESTINATION bin)
 
diff --git a/producer/folder_monitor_producer/src/event_detector.cpp b/producer/event_monitor_producer/src/event_detector.cpp
similarity index 100%
rename from producer/folder_monitor_producer/src/event_detector.cpp
rename to producer/event_monitor_producer/src/event_detector.cpp
diff --git a/producer/folder_monitor_producer/src/event_detector.h b/producer/event_monitor_producer/src/event_detector.h
similarity index 100%
rename from producer/folder_monitor_producer/src/event_detector.h
rename to producer/event_monitor_producer/src/event_detector.h
diff --git a/producer/folder_monitor_producer/src/event_detector_factory.cpp b/producer/event_monitor_producer/src/event_detector_factory.cpp
similarity index 75%
rename from producer/folder_monitor_producer/src/event_detector_factory.cpp
rename to producer/event_monitor_producer/src/event_detector_factory.cpp
index 2f1279b61610a090c0cce29e7e3ff4090e45580e..8933c2cb772504d8f888037bb20c5fc884f71a3c 100644
--- a/producer/folder_monitor_producer/src/event_detector_factory.cpp
+++ b/producer/event_monitor_producer/src/event_detector_factory.cpp
@@ -1,12 +1,12 @@
 #include "event_detector_factory.h"
 
-#include "foldermon_config.h"
+#include "eventmon_config.h"
 #include "inotify_event_detector.h"
 
 namespace asapo {
 
 EventDetector EventDetectorFactory::CreateEventDetector() {
-    auto config = GetFolderMonConfig();
+    auto config = GetEventMonConfig();
     return EventDetector{new InotifyEventDetector(config)};
 }
 
diff --git a/producer/folder_monitor_producer/src/event_detector_factory.h b/producer/event_monitor_producer/src/event_detector_factory.h
similarity index 100%
rename from producer/folder_monitor_producer/src/event_detector_factory.h
rename to producer/event_monitor_producer/src/event_detector_factory.h
diff --git a/producer/folder_monitor_producer/src/foldermon_config.cpp b/producer/event_monitor_producer/src/eventmon_config.cpp
similarity index 72%
rename from producer/folder_monitor_producer/src/foldermon_config.cpp
rename to producer/event_monitor_producer/src/eventmon_config.cpp
index 2d89a9276f35c2eda5ff6dc34c581368591cab49..b5ac647a22eeb34269936398cb1914e948795fe3 100644
--- a/producer/folder_monitor_producer/src/foldermon_config.cpp
+++ b/producer/event_monitor_producer/src/eventmon_config.cpp
@@ -1,17 +1,17 @@
-#include "foldermon_config.h"
-#include "foldermon_config_factory.h"
+#include "eventmon_config.h"
+#include "eventmon_config_factory.h"
 #include "io/io_factory.h"
 #include "json_parser/json_parser.h"
 
 namespace asapo {
 
-FolderMonConfig config;
+EventMonConfig config;
 
-FolderMonConfigFactory::FolderMonConfigFactory() : io__{GenerateDefaultIO()} {
+EventMonConfigFactory::EventMonConfigFactory() : io__{GenerateDefaultIO()} {
 
 }
 
-Error FolderMonConfigFactory::ParseConfigFile(std::string file_name) {
+Error EventMonConfigFactory::ParseConfigFile(std::string file_name) {
     JsonFileParser parser(file_name, &io__);
     Error err = nullptr;
     (err = parser.GetString("AsapoEndpoint", &config.asapo_endpoint)) ||
@@ -24,7 +24,7 @@ Error FolderMonConfigFactory::ParseConfigFile(std::string file_name) {
 }
 
 
-Error FolderMonConfigFactory::CheckConfig() {
+Error EventMonConfigFactory::CheckConfig() {
     Error err;
     (err = CheckMode()) ||
     (err = CheckLogLevel()) ||
@@ -33,7 +33,7 @@ Error FolderMonConfigFactory::CheckConfig() {
 }
 
 
-Error FolderMonConfigFactory::SetConfigFromFile(std::string file_name) {
+Error EventMonConfigFactory::SetConfigFromFile(std::string file_name) {
     auto  err = ParseConfigFile(file_name);
     if (err) {
         return err;
@@ -42,7 +42,7 @@ Error FolderMonConfigFactory::SetConfigFromFile(std::string file_name) {
     return CheckConfig();
 }
 
-Error FolderMonConfigFactory::CheckMode() {
+Error EventMonConfigFactory::CheckMode() {
     if (config.mode_str == "tcp") {
         config.mode = RequestHandlerType::kTcp;
     } else if (config.mode_str == "filesystem") {
@@ -53,14 +53,14 @@ Error FolderMonConfigFactory::CheckMode() {
     return nullptr;
 }
 
-Error FolderMonConfigFactory::CheckLogLevel() {
+Error EventMonConfigFactory::CheckLogLevel() {
     Error err;
     config.log_level = StringToLogLevel(config.log_level_str, &err);
     return err;
 }
 
 
-Error FolderMonConfigFactory::CheckNThreads() {
+Error EventMonConfigFactory::CheckNThreads() {
     if (config.nthreads == 0 || config.nthreads > kMaxProcessingThreads ) {
         return  TextError("NThreads should between 1 and " + std::to_string(kMaxProcessingThreads));
     }
@@ -69,7 +69,7 @@ Error FolderMonConfigFactory::CheckNThreads() {
 
 
 
-const FolderMonConfig*  GetFolderMonConfig() {
+const EventMonConfig*  GetEventMonConfig() {
     return &config;
 }
 
diff --git a/producer/folder_monitor_producer/src/foldermon_config.h b/producer/event_monitor_producer/src/eventmon_config.h
similarity index 62%
rename from producer/folder_monitor_producer/src/foldermon_config.h
rename to producer/event_monitor_producer/src/eventmon_config.h
index 06e9c1b827028f2dd68832cd62662212374f9cc4..ea3c6d1a291ce76335a990540a63b6a254e3a519 100644
--- a/producer/folder_monitor_producer/src/foldermon_config.h
+++ b/producer/event_monitor_producer/src/eventmon_config.h
@@ -1,15 +1,15 @@
-#ifndef ASAPO_FolderMon_CONFIG_H
-#define ASAPO_FolderMon_CONFIG_H
+#ifndef ASAPO_EventMon_CONFIG_H
+#define ASAPO_EventMon_CONFIG_H
 
 #include "io/io.h"
 #include "common/error.h"
 #include "logger/logger.h"
 #include "producer/common.h"
-#include "foldermon_config_factory.h"
+#include "eventmon_config_factory.h"
 
 namespace asapo {
 
-struct FolderMonConfig {
+struct EventMonConfig {
     std::string asapo_endpoint;
     LogLevel log_level = LogLevel::Info;
     std::string tag;
@@ -19,12 +19,12 @@ struct FolderMonConfig {
   private:
     std::string log_level_str;
     std::string mode_str;
-    friend FolderMonConfigFactory;
+    friend EventMonConfigFactory;
 };
 
-const FolderMonConfig* GetFolderMonConfig();
+const EventMonConfig* GetEventMonConfig();
 
 }
 
 
-#endif //ASAPO_FolderMon_CONFIG_H
+#endif //ASAPO_EventMon_CONFIG_H
diff --git a/producer/folder_monitor_producer/src/foldermon_config_factory.h b/producer/event_monitor_producer/src/eventmon_config_factory.h
similarity index 64%
rename from producer/folder_monitor_producer/src/foldermon_config_factory.h
rename to producer/event_monitor_producer/src/eventmon_config_factory.h
index c35ebd2f888dc8a0d318cd17c077c07f319ea093..eb3735158028eef8161fd18b5c1534ff3c089987 100644
--- a/producer/folder_monitor_producer/src/foldermon_config_factory.h
+++ b/producer/event_monitor_producer/src/eventmon_config_factory.h
@@ -1,14 +1,14 @@
-#ifndef ASAPO_FolderMon_CONFIG_FACTORY__H
-#define ASAPO_FolderMon_CONFIG_FACTORY__H
+#ifndef ASAPO_EventMon_CONFIG_FACTORY__H
+#define ASAPO_EventMon_CONFIG_FACTORY__H
 
 #include "io/io.h"
 #include "common/error.h"
 
 namespace asapo {
 
-class FolderMonConfigFactory {
+class EventMonConfigFactory {
   public:
-    FolderMonConfigFactory();
+    EventMonConfigFactory();
     Error SetConfigFromFile(std::string file_name);
   public:
     std::unique_ptr<IO> io__;
@@ -24,4 +24,4 @@ class FolderMonConfigFactory {
 }
 
 
-#endif //ASAPO_FolderMon_CONFIG_FACTORY__H
+#endif //ASAPO_EventMon_CONFIG_FACTORY__H
diff --git a/producer/folder_monitor_producer/src/foldermon_logger.cpp b/producer/event_monitor_producer/src/eventmon_logger.cpp
similarity index 61%
rename from producer/folder_monitor_producer/src/foldermon_logger.cpp
rename to producer/event_monitor_producer/src/eventmon_logger.cpp
index 20ab66a9820e5cf7543d19451811c38258f35c34..946bfa71764c858064ed90668d591f16cc6f9926 100644
--- a/producer/folder_monitor_producer/src/foldermon_logger.cpp
+++ b/producer/event_monitor_producer/src/eventmon_logger.cpp
@@ -1,8 +1,8 @@
-#include "foldermon_logger.h"
+#include "eventmon_logger.h"
 
 namespace asapo {
 
-AbstractLogger* GetDefaultFolderMonLogger() {
+AbstractLogger* GetDefaultEventMonLogger() {
     static Logger logger = asapo::CreateDefaultLoggerBin("producer ");
     return logger.get();
 }
diff --git a/producer/event_monitor_producer/src/eventmon_logger.h b/producer/event_monitor_producer/src/eventmon_logger.h
new file mode 100644
index 0000000000000000000000000000000000000000..127ff127cfd787e5d6421c7d1e54083befab384b
--- /dev/null
+++ b/producer/event_monitor_producer/src/eventmon_logger.h
@@ -0,0 +1,14 @@
+#ifndef ASAPO_EventMon_LOGGER_H
+#define ASAPO_EventMon_LOGGER_H
+
+#include "logger/logger.h"
+
+namespace asapo {
+
+
+AbstractLogger* GetDefaultEventMonLogger();
+
+}
+
+
+#endif //ASAPO_EventMon_LOGGER_H
diff --git a/producer/folder_monitor_producer/src/foldermon_main.cpp b/producer/event_monitor_producer/src/eventmon_main.cpp
similarity index 82%
rename from producer/folder_monitor_producer/src/foldermon_main.cpp
rename to producer/event_monitor_producer/src/eventmon_main.cpp
index abc3ca5aa213bf4fae85199015b1c4cffa410413..e2894cf9feeb831bb1b406584041fe60b12fd183 100644
--- a/producer/folder_monitor_producer/src/foldermon_main.cpp
+++ b/producer/event_monitor_producer/src/eventmon_main.cpp
@@ -5,27 +5,27 @@
 #include <thread>
 
 #include "asapo_producer.h"
-#include "foldermon_config.h"
-#include "foldermon_config_factory.h"
+#include "eventmon_config.h"
+#include "eventmon_config_factory.h"
 #include "event_detector_factory.h"
-#include "foldermon_logger.h"
+#include "eventmon_logger.h"
 
 using asapo::Producer;
-using asapo::FolderMonConfigFactory;
+using asapo::EventMonConfigFactory;
 using asapo::Error;
-using asapo::GetFolderMonConfig;
+using asapo::GetEventMonConfig;
 
 Error ReadConfigFile(int argc, char* argv[]) {
     if (argc != 2) {
         std::cerr << "Usage: " << argv[0] << " <config file>" << std::endl;
         exit(EXIT_FAILURE);
     }
-    FolderMonConfigFactory factory;
+    EventMonConfigFactory factory;
     return factory.SetConfigFromFile(argv[1]);
 }
 
 std::unique_ptr<Producer> CreateProducer() {
-    auto config = GetFolderMonConfig();
+    auto config = GetEventMonConfig();
 
 
     Error err;
@@ -43,7 +43,7 @@ std::unique_ptr<Producer> CreateProducer() {
 
 void ProcessAfterSend(asapo::GenericRequestHeader header, asapo::Error err) {
     if (err) {
-        const auto& logger = asapo::GetDefaultFolderMonLogger();
+        const auto& logger = asapo::GetDefaultEventMonLogger();
         logger->Error("data was not successfully send: " + err->Explain());
         return;
     }
@@ -57,8 +57,8 @@ int main (int argc, char* argv[]) {
         return EXIT_FAILURE;
     }
 
-    const auto& logger = asapo::GetDefaultFolderMonLogger();
-    logger->SetLogLevel(GetFolderMonConfig()->log_level);
+    const auto& logger = asapo::GetDefaultEventMonLogger();
+    logger->SetLogLevel(GetEventMonConfig()->log_level);
 
 
     auto producer = CreateProducer();
diff --git a/producer/folder_monitor_producer/src/inotify_event_detector.cpp b/producer/event_monitor_producer/src/inotify_event_detector.cpp
similarity index 61%
rename from producer/folder_monitor_producer/src/inotify_event_detector.cpp
rename to producer/event_monitor_producer/src/inotify_event_detector.cpp
index d612886d758739ca3653eb3bffa28e2d106b03f5..7806035c608e07e4137b3fabc3193086197040a2 100644
--- a/producer/folder_monitor_producer/src/inotify_event_detector.cpp
+++ b/producer/event_monitor_producer/src/inotify_event_detector.cpp
@@ -5,7 +5,7 @@ namespace asapo {
 Error InotifyEventDetector::GetNextEvent(EventHeader* event_header) {
     return nullptr;
 }
-InotifyEventDetector::InotifyEventDetector(const FolderMonConfig* config) : config_{config} {
+InotifyEventDetector::InotifyEventDetector(const EventMonConfig* config) : config_{config} {
 }
 
 }
\ No newline at end of file
diff --git a/producer/folder_monitor_producer/src/inotify_event_detector.h b/producer/event_monitor_producer/src/inotify_event_detector.h
similarity index 71%
rename from producer/folder_monitor_producer/src/inotify_event_detector.h
rename to producer/event_monitor_producer/src/inotify_event_detector.h
index de47ebbb6a440f12eb4a2db009f574534f33d918..37bd1f2ec6a93c9a09c62f6ab030f032983af13c 100644
--- a/producer/folder_monitor_producer/src/inotify_event_detector.h
+++ b/producer/event_monitor_producer/src/inotify_event_detector.h
@@ -2,16 +2,16 @@
 #define ASAPO_INOTOFY_EVENT_DETECTOR_H
 
 #include "event_detector.h"
-#include "foldermon_config.h"
+#include "eventmon_config.h"
 
 namespace asapo {
 
 class InotifyEventDetector : public AbstractEventDetector {
   public:
     Error GetNextEvent(EventHeader* event_header) override;
-    InotifyEventDetector(const FolderMonConfig* config);
+    InotifyEventDetector(const EventMonConfig* config);
   private:
-    const FolderMonConfig* config_;
+    const EventMonConfig* config_;
 };
 
 }
diff --git a/producer/folder_monitor_producer/unittests/foldermon_mocking.h b/producer/event_monitor_producer/unittests/eventmon_mocking.h
similarity index 100%
rename from producer/folder_monitor_producer/unittests/foldermon_mocking.h
rename to producer/event_monitor_producer/unittests/eventmon_mocking.h
diff --git a/producer/folder_monitor_producer/unittests/mock_foldermon_config.cpp b/producer/event_monitor_producer/unittests/mock_eventmon_config.cpp
similarity index 89%
rename from producer/folder_monitor_producer/unittests/mock_foldermon_config.cpp
rename to producer/event_monitor_producer/unittests/mock_eventmon_config.cpp
index bca6b9f8249f93ce75651c25defb243306513206..ecf5a3d10fe3874856ebc49d37eac9f64a7d3a77 100644
--- a/producer/folder_monitor_producer/unittests/mock_foldermon_config.cpp
+++ b/producer/event_monitor_producer/unittests/mock_eventmon_config.cpp
@@ -1,9 +1,9 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "mock_foldermon_config.h"
-#include "../src/foldermon_config_factory.h"
-#include "../src/foldermon_config.h"
+#include "mock_eventmon_config.h"
+#include "../src/eventmon_config_factory.h"
+#include "../src/eventmon_config.h"
 
 #include <unittests/MockIO.h>
 
@@ -11,9 +11,9 @@ using testing::_;
 
 namespace asapo {
 
-Error SetFolderMonConfig (const FolderMonConfig& config) {
+Error SetFolderMonConfig (const EventMonConfig& config) {
     MockIO mock_io;
-    FolderMonConfigFactory config_factory;
+    EventMonConfigFactory config_factory;
     config_factory.io__ = std::unique_ptr<IO> {&mock_io};
 
     std::string log_level;
diff --git a/producer/folder_monitor_producer/unittests/mock_foldermon_config.h b/producer/event_monitor_producer/unittests/mock_eventmon_config.h
similarity index 53%
rename from producer/folder_monitor_producer/unittests/mock_foldermon_config.h
rename to producer/event_monitor_producer/unittests/mock_eventmon_config.h
index bf3c2374a0d58306bbe2dbe02db466ea8f8e1bc0..6453d6c796c95d40638c7567cb67d45d41d739bc 100644
--- a/producer/folder_monitor_producer/unittests/mock_foldermon_config.h
+++ b/producer/event_monitor_producer/unittests/mock_eventmon_config.h
@@ -1,12 +1,12 @@
 #ifndef ASAPO_MOCK_RECEIVER_CONFIG_H
 #define ASAPO_MOCK_RECEIVER_CONFIG_H
 
-#include "../src/foldermon_config.h"
+#include "../src/eventmon_config.h"
 
 
 namespace asapo {
 
-Error SetFolderMonConfig (const FolderMonConfig& config);
+Error SetFolderMonConfig (const EventMonConfig& config);
 
 }
 
diff --git a/producer/folder_monitor_producer/unittests/test_event_detector_factory.cpp b/producer/event_monitor_producer/unittests/test_event_detector_factory.cpp
similarity index 85%
rename from producer/folder_monitor_producer/unittests/test_event_detector_factory.cpp
rename to producer/event_monitor_producer/unittests/test_event_detector_factory.cpp
index 1f1c5fcfcbd1df27cae0d6f5f4cc622b8bff39d1..da5b075e79ea14bbf538dc5db9e48370ba725eb1 100644
--- a/producer/folder_monitor_producer/unittests/test_event_detector_factory.cpp
+++ b/producer/event_monitor_producer/unittests/test_event_detector_factory.cpp
@@ -1,8 +1,8 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "foldermon_mocking.h"
-#include "mock_foldermon_config.h"
+#include "eventmon_mocking.h"
+#include "mock_eventmon_config.h"
 #include "../src/event_detector_factory.h"
 #include "../src/inotify_event_detector.h"
 
@@ -15,7 +15,7 @@ using ::asapo::Error;
 
 
 using asapo::EventDetectorFactory;
-using asapo::FolderMonConfig;
+using asapo::EventMonConfig;
 
 namespace {
 
@@ -24,7 +24,7 @@ class FactoryTests : public Test {
   public:
     EventDetectorFactory factory;
     Error err{nullptr};
-    FolderMonConfig config;
+    EventMonConfig config;
     void SetUp() override {
         asapo::SetFolderMonConfig(config);
     }
diff --git a/producer/folder_monitor_producer/unittests/test_foldermon_config.cpp b/producer/event_monitor_producer/unittests/test_eventmon_config.cpp
similarity index 85%
rename from producer/folder_monitor_producer/unittests/test_foldermon_config.cpp
rename to producer/event_monitor_producer/unittests/test_eventmon_config.cpp
index f6b5cd761945f7ceba73ae42d7f3685c5fee06fc..779d7d9c1943eea48d19c4d3ebbaa3ff78d2b10a 100644
--- a/producer/folder_monitor_producer/unittests/test_foldermon_config.cpp
+++ b/producer/event_monitor_producer/unittests/test_eventmon_config.cpp
@@ -2,9 +2,9 @@
 #include <gmock/gmock.h>
 #include <unittests/MockIO.h>
 
-#include "../src/foldermon_config.h"
-#include "../src/foldermon_config_factory.h"
-#include "mock_foldermon_config.h"
+#include "../src/eventmon_config.h"
+#include "../src/eventmon_config_factory.h"
+#include "mock_eventmon_config.h"
 
 using ::testing::Test;
 using ::testing::Return;
@@ -26,8 +26,8 @@ using ::asapo::FileDescriptor;
 using ::asapo::SocketDescriptor;
 using ::asapo::MockIO;
 
-using ::asapo::FolderMonConfigFactory;
-using asapo::FolderMonConfig;
+using ::asapo::EventMonConfigFactory;
+using asapo::EventMonConfig;
 
 namespace {
 
@@ -35,7 +35,7 @@ namespace {
 class ConfigTests : public Test {
   public:
     MockIO mock_io;
-    FolderMonConfigFactory config_factory;
+    EventMonConfigFactory config_factory;
     void SetUp() override {
         config_factory.io__ = std::unique_ptr<asapo::IO> {&mock_io};
     }
@@ -47,7 +47,7 @@ class ConfigTests : public Test {
 
 
 TEST_F(ConfigTests, ReadSettingsOK) {
-    asapo::FolderMonConfig test_config;
+    asapo::EventMonConfig test_config;
     test_config.nthreads = 10;
     test_config.tag = "folderMon1";
     test_config.log_level = asapo::LogLevel::Error;
@@ -57,7 +57,7 @@ TEST_F(ConfigTests, ReadSettingsOK) {
 
     auto err = asapo::SetFolderMonConfig(test_config);
 
-    auto config = asapo::GetFolderMonConfig();
+    auto config = asapo::GetEventMonConfig();
 
     ASSERT_THAT(err, Eq(nullptr));
     ASSERT_THAT(config->log_level, Eq(asapo::LogLevel::Error));
@@ -69,7 +69,7 @@ TEST_F(ConfigTests, ReadSettingsOK) {
 }
 
 TEST_F(ConfigTests, ReadSettingsChecksNthreads) {
-    asapo::FolderMonConfig test_config;
+    asapo::EventMonConfig test_config;
     test_config.nthreads = 0;
 
     auto err = asapo::SetFolderMonConfig(test_config);
@@ -84,7 +84,7 @@ TEST_F(ConfigTests, ReadSettingsChecksNthreads) {
 
 
 TEST_F(ConfigTests, ReadSettingsChecksMode) {
-    asapo::FolderMonConfig test_config;
+    asapo::EventMonConfig test_config;
     test_config.nthreads = 1;
     test_config.asapo_endpoint = "wrongmode"; // we use it to set mode string to some wrong value
     auto err = asapo::SetFolderMonConfig(test_config);
diff --git a/producer/folder_monitor_producer/src/foldermon_logger.h b/producer/folder_monitor_producer/src/foldermon_logger.h
deleted file mode 100644
index e5365234dcae764721866caaaaa72b4b486529cb..0000000000000000000000000000000000000000
--- a/producer/folder_monitor_producer/src/foldermon_logger.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef ASAPO_FolderMon_LOGGER_H
-#define ASAPO_FolderMon_LOGGER_H
-
-#include "logger/logger.h"
-
-namespace asapo {
-
-
-AbstractLogger* GetDefaultFolderMonLogger();
-
-}
-
-
-#endif //ASAPO_FolderMon_LOGGER_H