diff --git a/src/KodiInterface.cpp b/src/KodiInterface.cpp
index 776e9af..8b89f8b 100644
--- a/src/KodiInterface.cpp
+++ b/src/KodiInterface.cpp
@@ -41,8 +41,8 @@ KodiInterface::KodiInterface()
 	signal(SIGPIPE, SIG_IGN);
 	_socket = std::unique_ptr<BaseLib::TcpSocket>(new BaseLib::TcpSocket(GD::bl));
 
-	_jsonEncoder.reset(new BaseLib::RPC::JsonEncoder(GD::bl));
-	_jsonDecoder.reset(new BaseLib::RPC::JsonDecoder(GD::bl));
+	_jsonEncoder.reset(new BaseLib::Rpc::JsonEncoder(GD::bl));
+	_jsonDecoder.reset(new BaseLib::Rpc::JsonDecoder(GD::bl));
 }
 
 KodiInterface::~KodiInterface()
@@ -373,7 +373,7 @@ void KodiInterface::listen()
 					}
         		}
         	}
-			catch(BaseLib::RPC::JsonDecoderException& ex)
+			catch(BaseLib::Rpc::JsonDecoderException& ex)
 			{
 				continue;
 			}
diff --git a/src/KodiInterface.h b/src/KodiInterface.h
index 51652a7..2d05ef2 100644
--- a/src/KodiInterface.h
+++ b/src/KodiInterface.h
@@ -71,8 +71,8 @@ class KodiInterface
 	std::unique_ptr<BaseLib::TcpSocket> _socket;
 	std::string _hostname;
 	int32_t _port = 9090;
-	std::unique_ptr<BaseLib::RPC::JsonEncoder> _jsonEncoder;
-	std::unique_ptr<BaseLib::RPC::JsonDecoder> _jsonDecoder;
+	std::unique_ptr<BaseLib::Rpc::JsonEncoder> _jsonEncoder;
+	std::unique_ptr<BaseLib::Rpc::JsonDecoder> _jsonDecoder;
 	std::function<void(bool connected)> _connectedCallback;
 	std::function<void(std::shared_ptr<MyPacket> packet)> _packetReceivedCallback;
 
diff --git a/src/MyPeer.cpp b/src/MyPeer.cpp
index 7c5d7a6..f062b97 100644
--- a/src/MyPeer.cpp
+++ b/src/MyPeer.cpp
@@ -92,8 +92,8 @@ void MyPeer::init()
 {
 	try
 	{
-		_binaryEncoder.reset(new BaseLib::RPC::RPCEncoder(GD::bl));
-		_binaryDecoder.reset(new BaseLib::RPC::RPCDecoder(GD::bl));
+		_binaryEncoder.reset(new BaseLib::Rpc::RpcEncoder(GD::bl));
+		_binaryDecoder.reset(new BaseLib::Rpc::RpcDecoder(GD::bl));
 		_interface.setPacketReceivedCallback(std::bind(&MyPeer::packetReceived, this, std::placeholders::_1));
 		_interface.setConnectedCallback(std::bind(&MyPeer::connected, this, std::placeholders::_1));
 	}
diff --git a/src/MyPeer.h b/src/MyPeer.h
index f684312..51bd266 100644
--- a/src/MyPeer.h
+++ b/src/MyPeer.h
@@ -98,8 +98,8 @@ class MyPeer : public BaseLib::Systems::Peer, public BaseLib::Rpc::IWebserverEve
 	virtual PVariable setValue(BaseLib::PRpcClientInfo clientInfo, uint32_t channel, std::string valueKey, PVariable value, bool wait);
 	//End RPC methods
 protected:
-	std::shared_ptr<BaseLib::RPC::RPCEncoder> _binaryEncoder;
-	std::shared_ptr<BaseLib::RPC::RPCDecoder> _binaryDecoder;
+	std::shared_ptr<BaseLib::Rpc::RpcEncoder> _binaryEncoder;
+	std::shared_ptr<BaseLib::Rpc::RpcDecoder> _binaryDecoder;
 
 	bool _shuttingDown = false;
 	KodiInterface _interface;