diff --git a/Common/Libraries/ZMQPublisher/include/PyZMQPublisher.hpp b/Common/Libraries/ZMQPublisherLibrary/include/PyZMQPublisher.hpp
similarity index 100%
rename from Common/Libraries/ZMQPublisher/include/PyZMQPublisher.hpp
rename to Common/Libraries/ZMQPublisherLibrary/include/PyZMQPublisher.hpp
diff --git a/Common/Libraries/ZMQPublisher/include/ZMQDictionary.hpp b/Common/Libraries/ZMQPublisherLibrary/include/ZMQDictionary.hpp
similarity index 100%
rename from Common/Libraries/ZMQPublisher/include/ZMQDictionary.hpp
rename to Common/Libraries/ZMQPublisherLibrary/include/ZMQDictionary.hpp
diff --git a/Common/Libraries/ZMQPublisher/include/ZMQPublisher.hpp b/Common/Libraries/ZMQPublisherLibrary/include/ZMQPublisher.hpp
similarity index 100%
rename from Common/Libraries/ZMQPublisher/include/ZMQPublisher.hpp
rename to Common/Libraries/ZMQPublisherLibrary/include/ZMQPublisher.hpp
diff --git a/Common/Libraries/ZMQPublisher/src/Makefile b/Common/Libraries/ZMQPublisherLibrary/src/Makefile
similarity index 100%
rename from Common/Libraries/ZMQPublisher/src/Makefile
rename to Common/Libraries/ZMQPublisherLibrary/src/Makefile
diff --git a/Common/Libraries/ZMQPublisher/src/PyZMQPublisher.cpp b/Common/Libraries/ZMQPublisherLibrary/src/PyZMQPublisher.cpp
similarity index 100%
rename from Common/Libraries/ZMQPublisher/src/PyZMQPublisher.cpp
rename to Common/Libraries/ZMQPublisherLibrary/src/PyZMQPublisher.cpp
diff --git a/Common/Libraries/ZMQPublisher/src/ZMQPublisher.cpp b/Common/Libraries/ZMQPublisherLibrary/src/ZMQPublisher.cpp
similarity index 100%
rename from Common/Libraries/ZMQPublisher/src/ZMQPublisher.cpp
rename to Common/Libraries/ZMQPublisherLibrary/src/ZMQPublisher.cpp
diff --git a/Common/Libraries/ZMQPublisher/src/ZMQPublisher/__init__.py b/Common/Libraries/ZMQPublisherLibrary/src/ZMQPublisher/__init__.py
similarity index 100%
rename from Common/Libraries/ZMQPublisher/src/ZMQPublisher/__init__.py
rename to Common/Libraries/ZMQPublisherLibrary/src/ZMQPublisher/__init__.py
diff --git a/Common/Libraries/ZMQPublisher/tests/Makefile b/Common/Libraries/ZMQPublisherLibrary/tests/Makefile
similarity index 100%
rename from Common/Libraries/ZMQPublisher/tests/Makefile
rename to Common/Libraries/ZMQPublisherLibrary/tests/Makefile
diff --git a/Common/Libraries/ZMQPublisher/tests/example.cpp b/Common/Libraries/ZMQPublisherLibrary/tests/example.cpp
similarity index 100%
rename from Common/Libraries/ZMQPublisher/tests/example.cpp
rename to Common/Libraries/ZMQPublisherLibrary/tests/example.cpp
diff --git a/Common/Libraries/ZMQPublisher/tests/pyunit/example.py b/Common/Libraries/ZMQPublisherLibrary/tests/pyunit/example.py
similarity index 100%
rename from Common/Libraries/ZMQPublisher/tests/pyunit/example.py
rename to Common/Libraries/ZMQPublisherLibrary/tests/pyunit/example.py
diff --git a/SystemMake/Makefile b/SystemMake/Makefile
index a30fc800503183c83ac84c595fdb9ec7217dc887..fe08b75b0f076264f126bc6f4ae0f877cf19fb6c 100644
--- a/SystemMake/Makefile
+++ b/SystemMake/Makefile
@@ -31,7 +31,7 @@ COMMON_INTERFACES:=CommonInterface ManagmentInterface AntennaInterface Receivers
                    XBackendInterface
 COMMON_LIBRARIES:=SlaLibrary IRALibrary DiscosVersion TextWindowLibrary ParserLibrary \
                   XarcosLibrary ModbusChannel ComponentProxy DiscosLocals XEphemAstroLib \
-				  DiscosBackendProtocol PyTestingLibrary ZMQPublisher \
+				  DiscosBackendProtocol PyTestingLibrary ZMQPublisherLibrary \
 COMMON_SERVERS:=AntennaBoss Observatory OTF PointingModel Refraction SkySource SolarSystem \
                 Moon FitsWriter Scheduler ReceiversBoss ExternalClients \
                 CalibrationTool TotalPower CustomLogger \
@@ -81,7 +81,7 @@ ifeq ($(STATION),SRT)
 		ActiveSurfaceErrors \
 		CommonInterface ManagmentInterface AntennaInterface ReceiversInterface BackendsInterface MinorServoInterface WeatherStationInterface ActiveSurfaceInterface \
 		SRTAntennaInterface SRTActiveSurfaceInterface SRTWeatherStationInterface SRTReceiversInterface \
-		SlaLibrary IRALibrary TextWindowLibrary ParserLibrary XarcosLibrary SRTMinorServoLibrary ComponentProxy ModbusChannel PyTestingLibrary ZMQPublisher \
+		SlaLibrary IRALibrary TextWindowLibrary ParserLibrary XarcosLibrary SRTMinorServoLibrary ComponentProxy ModbusChannel PyTestingLibrary ZMQPublisherLibrary \
 		AntennaBoss Observatory OTF PointingModel Refraction SkySource Moon FitsWriter Scheduler ReceiversBoss ExternalClients CalibrationTool TotalPower CustomLogger \
 		SRTMount SRTActiveSurfaceBoss SRTMinorServo SRTKBandMFReceiver SRTWeatherStation SRT7GHzReceiver SRTLPBandReceiver \
 		SRT5GHzReceiver PyDewarPositioner \
@@ -99,7 +99,7 @@ ifeq ($(STATION),SRT)
 	Receivers_MODULES:=ReceiversInterface
 	MinorServo_MODULES:=MinorServoInterface
 	SRTActiveSurface_MODULES:=SRTActiveSurfaceInterface
-	Libraries_MODULES:=IRALibrary SlaLibrary TextWindowLibrary ParserLibrary SRTMinorServoLibrary PyTestingLibrary ZMQPublisher
+	Libraries_MODULES:=IRALibrary SlaLibrary TextWindowLibrary ParserLibrary SRTMinorServoLibrary PyTestingLibrary ZMQPublisherLibrary
 	AntennaImplementation_MODULES:=Observatory SkySource OTF Moon PointingModel Refraction AntennaBoss SRTMount
 	ManagementImplementation_MODULES:=Scheduler CalibrationTool FitsWriter ExternalClients
 	BackendsImplementation_MODULES:=TotalPower