diff --git a/reflector/BMClient.cpp b/reflector/BMClient.cpp
index 4167c71..ed5caaa 100644
--- a/reflector/BMClient.cpp
+++ b/reflector/BMClient.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/BMClient.h b/reflector/BMClient.h
index 4f7930b..5653611 100644
--- a/reflector/BMClient.h
+++ b/reflector/BMClient.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal Reflector
+// urfd -- The universal Reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
@@ -36,7 +36,7 @@ public:
 	EProtocol GetProtocol(void) const           { return EProtocol::ulx; }
 	int GetProtocolRevision(void) const         { return XLX_PROTOCOL_REVISION_2; }
 	const char *GetProtocolName(void) const     { return "ULX"; }
-	int GetCodec(void) const                    { return CODEC_AMBE2PLUS; }
+	ECodecType GetCodec(void) const             { return ECodecType::dmr; }
 	bool IsPeer(void) const                     { return true; }
 
 	// status
diff --git a/reflector/BMPeer.cpp b/reflector/BMPeer.cpp
index 89e33bc..846fc64 100644
--- a/reflector/BMPeer.cpp
+++ b/reflector/BMPeer.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2016 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/BMPeer.h b/reflector/BMPeer.h
index 765ac3a..c0c28d2 100644
--- a/reflector/BMPeer.h
+++ b/reflector/BMPeer.h
@@ -1,6 +1,6 @@
 //  Copyright © 2016 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/BPTC19696.cpp b/reflector/BPTC19696.cpp
index fe9d0bb..20ac968 100644
--- a/reflector/BPTC19696.cpp
+++ b/reflector/BPTC19696.cpp
@@ -1,7 +1,7 @@
 //	 Copyright (C) 2012 by Ian Wraith
 //   Copyright (C) 2015 by Jonathan Naylor G4KLX
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/BPTC19696.h b/reflector/BPTC19696.h
index fd5f0ae..1882d08 100644
--- a/reflector/BPTC19696.h
+++ b/reflector/BPTC19696.h
@@ -1,6 +1,6 @@
 //   Copyright (C) 2015 by Jonathan Naylor G4KLX
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Buffer.cpp b/reflector/Buffer.cpp
index 23d804c..544ba84 100644
--- a/reflector/Buffer.cpp
+++ b/reflector/Buffer.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Buffer.h b/reflector/Buffer.h
index 7905d3d..b4cf127 100644
--- a/reflector/Buffer.h
+++ b/reflector/Buffer.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/CNotificationQueue.h b/reflector/CNotificationQueue.h
index ae5e644..57839ad 100644
--- a/reflector/CNotificationQueue.h
+++ b/reflector/CNotificationQueue.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc. All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/CRC.cpp b/reflector/CRC.cpp
index b2241c3..3275319 100644
--- a/reflector/CRC.cpp
+++ b/reflector/CRC.cpp
@@ -1,6 +1,6 @@
 //  Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/CRC.h b/reflector/CRC.h
index f291d53..f52d5b5 100644
--- a/reflector/CRC.h
+++ b/reflector/CRC.h
@@ -1,6 +1,6 @@
 //   Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Callsign.cpp b/reflector/Callsign.cpp
index 3d1996b..24438e1 100644
--- a/reflector/Callsign.cpp
+++ b/reflector/Callsign.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
@@ -49,16 +49,19 @@ CCallsign::CCallsign(const char *sz, uint32_t dmrid)
 	m_uiDmrid = dmrid;
 
 	// and populate
-	if ( ::strlen(sz) > 0 )
+	auto len = strlen(sz);
+	if ( len > 0 )
 	{
-		// Calculate the M17 coded callsign
-		CSIn();
 		// callsign valid
-		memcpy(m_Callsign, sz, MIN(strlen(sz), CALLSIGN_LEN-1));
-		if ( strlen(sz) >= CALLSIGN_LEN )
+		memcpy(m_Callsign, sz, MIN(len, CALLSIGN_LEN-1));
+		if ( len > CALLSIGN_LEN )
 		{
-			m_Module = sz[CALLSIGN_LEN-1];
+			m_Module = sz[len-1];
 		}
+
+		// Calculate the M17 coded callsign
+		CSIn();
+
 		// dmrid ok ?
 		if ( m_uiDmrid == 0 )
 		{
@@ -145,10 +148,11 @@ void CCallsign::SetCallsign(const char *sz, bool UpdateDmrid)
 	// set callsign
 	memset(m_Callsign, ' ', CALLSIGN_LEN);
 	m_Module = ' ';
-	memcpy(m_Callsign, sz, MIN(strlen(sz), CALLSIGN_LEN-1));
-	if ( strlen(sz) >= CALLSIGN_LEN )
+	auto len = strlen(sz);
+	memcpy(m_Callsign, sz, MIN(len, CALLSIGN_LEN-1));
+	if ( len > CALLSIGN_LEN )
 	{
-		m_Module = sz[CALLSIGN_LEN-1];
+		m_Module = sz[len-1];
 	}
 	// update M17 coded callsign
 	CSIn();
@@ -273,11 +277,8 @@ void CCallsign::GetCallsignString(char *sz) const
 
 const std::string CCallsign::GetCS(unsigned len) const
 {
-	if (len > 8)
-		len = 8;
-	std::string rval(m_Callsign);
-	if (len)
-		rval.resize(len, ' ');
+	std::string rval(m_Callsign, CALLSIGN_LEN);
+	rval.append(1, m_Module);
 	return rval;
 }
 
@@ -411,7 +412,7 @@ void CCallsign::CSIn()
 	auto pos = m17_alphabet.find(m_Module);
 	m_coded = pos;
 	m_coded *= 40;
-	for( int i=CALLSIGN_LEN-2; i>=0; i-- ) {
+	for( int i=CALLSIGN_LEN-1; i>=0; i-- ) {
 		pos = m17_alphabet.find(m_Callsign[i]);
 		if (pos == std::string::npos) {
 			pos = 0;
diff --git a/reflector/Callsign.h b/reflector/Callsign.h
index b0d1882..8b0412f 100644
--- a/reflector/Callsign.h
+++ b/reflector/Callsign.h
@@ -1,6 +1,6 @@
 ///  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
@@ -18,6 +18,9 @@
 
 #pragma once
 
+#include <cstdint>
+#include <string>
+
 ////////////////////////////////////////////////////////////////////////////////////////
 // define
 
diff --git a/reflector/CallsignList.cpp b/reflector/CallsignList.cpp
index 4780498..cb4423b 100644
--- a/reflector/CallsignList.cpp
+++ b/reflector/CallsignList.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/CallsignList.h b/reflector/CallsignList.h
index 2c6a521..8ed2c9c 100644
--- a/reflector/CallsignList.h
+++ b/reflector/CallsignList.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/CallsignListItem.cpp b/reflector/CallsignListItem.cpp
index 275bfa1..ac0034c 100644
--- a/reflector/CallsignListItem.cpp
+++ b/reflector/CallsignListItem.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/CallsignListItem.h b/reflector/CallsignListItem.h
index 0906548..2699567 100644
--- a/reflector/CallsignListItem.h
+++ b/reflector/CallsignListItem.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Client.cpp b/reflector/Client.cpp
index 47e1065..ebdca28 100644
--- a/reflector/Client.cpp
+++ b/reflector/Client.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Client.h b/reflector/Client.h
index 13e203c..055c1e6 100644
--- a/reflector/Client.h
+++ b/reflector/Client.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
@@ -22,6 +22,7 @@
 #include "IP.h"
 #include "Callsign.h"
 #include "Buffer.h"
+#include "Packet.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////
 //
@@ -58,7 +59,7 @@ public:
 	// identity
 	virtual EProtocol GetProtocol(void) const           { return EProtocol::none; }
 	virtual int GetProtocolRevision(void) const         { return 0; }
-	virtual int GetCodec(void) const                    { return CODEC_NONE; }
+	virtual ECodecType GetCodec(void) const             { return ECodecType::none; }
 	virtual const char *GetProtocolName(void) const     { return "none"; }
 	virtual bool IsNode(void) const                     { return false; }
 	virtual bool IsPeer(void) const                     { return false; }
@@ -87,7 +88,7 @@ protected:
 
 	// status
 	char        m_ModuleMastered;
-	CTimer  m_LastKeepaliveTime;
+	CTimer      m_LastKeepaliveTime;
 	std::time_t m_ConnectTime;
 	std::time_t m_LastHeardTime;
 };
diff --git a/reflector/Clients.cpp b/reflector/Clients.cpp
index a034e20..cba611a 100644
--- a/reflector/Clients.cpp
+++ b/reflector/Clients.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Clients.h b/reflector/Clients.h
index 74183c3..e596076 100644
--- a/reflector/Clients.h
+++ b/reflector/Clients.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/CodecStream.cpp b/reflector/CodecStream.cpp
index 37cac37..d755267 100644
--- a/reflector/CodecStream.cpp
+++ b/reflector/CodecStream.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
@@ -25,13 +25,12 @@
 ////////////////////////////////////////////////////////////////////////////////////////
 // constructor
 
-CCodecStream::CCodecStream(CPacketStream *PacketStream, uint16_t uiId, uint8_t uiCodecIn, uint8_t uiCodecOut)
+CCodecStream::CCodecStream(CPacketStream *PacketStream, uint16_t uiId, ECodecType type)
 {
 	keep_running = true;
 	m_uiStreamId = uiId;
 	m_uiPid = 0;
-	m_uiCodecIn = uiCodecIn;
-	m_uiCodecOut = uiCodecOut;
+	m_eCodecIn = type;
 	m_bConnected = false;
 	m_fPingMin = -1;
 	m_fPingMax = -1;
diff --git a/reflector/CodecStream.h b/reflector/CodecStream.h
index fbc5568..4193ba7 100644
--- a/reflector/CodecStream.h
+++ b/reflector/CodecStream.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
@@ -21,15 +21,6 @@
 #include "UDPSocket.h"
 #include "PacketQueue.h"
 
-
-////////////////////////////////////////////////////////////////////////////////////////
-// define
-
-// frame sizes
-#define 9           9
-#define 9       9
-
-
 ////////////////////////////////////////////////////////////////////////////////////////
 // class
 
@@ -39,7 +30,7 @@ class CCodecStream : public CPacketQueue
 {
 public:
 	// constructor
-	CCodecStream(CPacketStream *, uint16_t, uint8_t, uint8_t);
+	CCodecStream(CPacketStream *, uint16_t, ECodecType);
 
 	// destructor
 	virtual ~CCodecStream();
@@ -76,8 +67,7 @@ protected:
 	uint16_t          m_uiStreamId;
 	uint16_t          m_uiPort;
 	uint8_t           m_uiPid;
-	uint8_t           m_uiCodecIn;
-	uint8_t           m_uiCodecOut;
+	ECodecType        m_eCodecIn;
 
 	// socket
 	CIp             m_Ip;
diff --git a/reflector/DCSClient.cpp b/reflector/DCSClient.cpp
index 1078b30..a30f140 100644
--- a/reflector/DCSClient.cpp
+++ b/reflector/DCSClient.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DCSClient.h b/reflector/DCSClient.h
index 47fb496..fd6c43b 100644
--- a/reflector/DCSClient.h
+++ b/reflector/DCSClient.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
@@ -34,7 +34,7 @@ public:
 	// identity
 	EProtocol GetProtocol(void) const           { return EProtocol::dcs; }
 	const char *GetProtocolName(void) const     { return "DCS"; }
-	int GetCodec(void) const                    { return CODEC_AMBEPLUS; }
+	ECodecType GetCodec(void) const             { return ECodecType::dstar; }
 	bool IsNode(void) const                     { return true; }
 
 	// status
diff --git a/reflector/DCSProtocol.cpp b/reflector/DCSProtocol.cpp
index bb0064b..52103cd 100644
--- a/reflector/DCSProtocol.cpp
+++ b/reflector/DCSProtocol.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DCSProtocol.h b/reflector/DCSProtocol.h
index 36a266a..eb10c80 100644
--- a/reflector/DCSProtocol.h
+++ b/reflector/DCSProtocol.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DExtraClient.cpp b/reflector/DExtraClient.cpp
index 5577a8a..5710be7 100644
--- a/reflector/DExtraClient.cpp
+++ b/reflector/DExtraClient.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DExtraClient.h b/reflector/DExtraClient.h
index ce77489..d8d0353 100644
--- a/reflector/DExtraClient.h
+++ b/reflector/DExtraClient.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
@@ -42,7 +42,7 @@ public:
 	EProtocol GetProtocol(void) const           { return EProtocol::dextra; }
 	int GetProtocolRevision(void) const         { return m_ProtRev; }
 	const char *GetProtocolName(void) const     { return "DExtra"; }
-	int GetCodec(void) const                    { return CODEC_AMBEPLUS; }
+	ECodecType GetCodec(void) const             { return ECodecType::dstar; }
 	bool IsNode(void) const                     { return true; }
 
 	// status
diff --git a/reflector/DExtraPeer.cpp b/reflector/DExtraPeer.cpp
index 2c2a21e..7e58723 100644
--- a/reflector/DExtraPeer.cpp
+++ b/reflector/DExtraPeer.cpp
@@ -1,7 +1,7 @@
 //  Created by Antony Chazapis (SV9OAN) on 25/2/2018.
 //  Copyright © 2016 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DExtraPeer.h b/reflector/DExtraPeer.h
index ddf2e62..ac6d538 100644
--- a/reflector/DExtraPeer.h
+++ b/reflector/DExtraPeer.h
@@ -1,7 +1,7 @@
 //  Created by Antony Chazapis (SV9OAN) on 25/2/2018.
 //  Copyright © 2016 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DExtraProtocol.cpp b/reflector/DExtraProtocol.cpp
index 2350b93..49d4a87 100644
--- a/reflector/DExtraProtocol.cpp
+++ b/reflector/DExtraProtocol.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DExtraProtocol.h b/reflector/DExtraProtocol.h
index ef886f8..f870363 100644
--- a/reflector/DExtraProtocol.h
+++ b/reflector/DExtraProtocol.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DMRIdDir.cpp b/reflector/DMRIdDir.cpp
index 7fb82d4..886a840 100644
--- a/reflector/DMRIdDir.cpp
+++ b/reflector/DMRIdDir.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DMRIdDir.h b/reflector/DMRIdDir.h
index ccd2b08..e4b8935 100644
--- a/reflector/DMRIdDir.h
+++ b/reflector/DMRIdDir.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DMRIdDirFile.cpp b/reflector/DMRIdDirFile.cpp
index 7517d81..d378ef5 100644
--- a/reflector/DMRIdDirFile.cpp
+++ b/reflector/DMRIdDirFile.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DMRIdDirFile.h b/reflector/DMRIdDirFile.h
index 75883bf..e4f4054 100644
--- a/reflector/DMRIdDirFile.h
+++ b/reflector/DMRIdDirFile.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DMRIdDirHttp.cpp b/reflector/DMRIdDirHttp.cpp
index 8d52da4..fa9453c 100644
--- a/reflector/DMRIdDirHttp.cpp
+++ b/reflector/DMRIdDirHttp.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DMRIdDirHttp.h b/reflector/DMRIdDirHttp.h
index 9a19250..54d2577 100644
--- a/reflector/DMRIdDirHttp.h
+++ b/reflector/DMRIdDirHttp.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DMRMMDVMClient.cpp b/reflector/DMRMMDVMClient.cpp
index e3c0f02..9f8b1f9 100644
--- a/reflector/DMRMMDVMClient.cpp
+++ b/reflector/DMRMMDVMClient.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DMRMMDVMClient.h b/reflector/DMRMMDVMClient.h
index 00924a3..7d59790 100644
--- a/reflector/DMRMMDVMClient.h
+++ b/reflector/DMRMMDVMClient.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
@@ -34,7 +34,7 @@ public:
 	// identity
 	EProtocol GetProtocol(void) const           { return EProtocol::dmrmmdvm; }
 	const char *GetProtocolName(void) const     { return "DMRMmdvm"; }
-	int GetCodec(void) const                    { return CODEC_AMBE2PLUS; }
+	ECodecType GetCodec(void) const             { return ECodecType::dstar; }
 	bool IsNode(void) const                     { return true; }
 
 	// status
diff --git a/reflector/DMRMMDVMProtocol.cpp b/reflector/DMRMMDVMProtocol.cpp
index 6b68890..2ec463d 100644
--- a/reflector/DMRMMDVMProtocol.cpp
+++ b/reflector/DMRMMDVMProtocol.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DMRMMDVMProtocol.h b/reflector/DMRMMDVMProtocol.h
index bc4e37f..6adf4d1 100644
--- a/reflector/DMRMMDVMProtocol.h
+++ b/reflector/DMRMMDVMProtocol.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DMRPlusClient.cpp b/reflector/DMRPlusClient.cpp
index 723da83..d5c709a 100644
--- a/reflector/DMRPlusClient.cpp
+++ b/reflector/DMRPlusClient.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DMRPlusClient.h b/reflector/DMRPlusClient.h
index 1a8d3ba..cef37ec 100644
--- a/reflector/DMRPlusClient.h
+++ b/reflector/DMRPlusClient.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
@@ -34,7 +34,7 @@ public:
 	// identity
 	EProtocol GetProtocol(void) const           { return EProtocol::dmrplus; }
 	const char *GetProtocolName(void) const     { return "DMRplus"; }
-	int GetCodec(void) const                    { return CODEC_AMBE2PLUS; }
+	ECodecType GetCodec(void) const             { return ECodecType::dmr; }
 	bool IsNode(void) const                     { return true; }
 
 	// status
diff --git a/reflector/DMRPlusProtocol.cpp b/reflector/DMRPlusProtocol.cpp
index ca2d1c4..e108c16 100644
--- a/reflector/DMRPlusProtocol.cpp
+++ b/reflector/DMRPlusProtocol.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DMRPlusProtocol.h b/reflector/DMRPlusProtocol.h
index 2c8c68c..250dc5f 100644
--- a/reflector/DMRPlusProtocol.h
+++ b/reflector/DMRPlusProtocol.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DPlusClient.cpp b/reflector/DPlusClient.cpp
index 2560a9c..098b86a 100644
--- a/reflector/DPlusClient.cpp
+++ b/reflector/DPlusClient.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DPlusClient.h b/reflector/DPlusClient.h
index 514a463..e0ef901 100644
--- a/reflector/DPlusClient.h
+++ b/reflector/DPlusClient.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
@@ -34,7 +34,7 @@ public:
 	// identity
 	EProtocol GetProtocol(void) const           { return EProtocol::dplus; }
 	const char *GetProtocolName(void) const     { return "DPlus"; }
-	int GetCodec(void) const                    { return CODEC_AMBEPLUS; }
+	ECodecType GetCodec(void) const             { return ECodecType::dstar; }
 	bool IsNode(void) const                     { return true; }
 	bool IsDextraDongle(void) const             { return m_bDextraDongle; }
 	void SetDextraDongle(void)                  { m_bDextraDongle = true; }
diff --git a/reflector/DPlusProtocol.cpp b/reflector/DPlusProtocol.cpp
index fc0f064..6cb8544 100644
--- a/reflector/DPlusProtocol.cpp
+++ b/reflector/DPlusProtocol.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DPlusProtocol.h b/reflector/DPlusProtocol.h
index 0afeb58..954bb6b 100644
--- a/reflector/DPlusProtocol.h
+++ b/reflector/DPlusProtocol.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DVFramePacket.cpp b/reflector/DVFramePacket.cpp
index 569187a..1975054 100644
--- a/reflector/DVFramePacket.cpp
+++ b/reflector/DVFramePacket.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 //
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DVFramePacket.h b/reflector/DVFramePacket.h
index 628f4dc..19387a6 100644
--- a/reflector/DVFramePacket.h
+++ b/reflector/DVFramePacket.h
@@ -2,7 +2,7 @@
 
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 //
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DVHeaderPacket.cpp b/reflector/DVHeaderPacket.cpp
index c078857..27adbac 100644
--- a/reflector/DVHeaderPacket.cpp
+++ b/reflector/DVHeaderPacket.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 //
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DVHeaderPacket.h b/reflector/DVHeaderPacket.h
index 43c64da..a242fbe 100644
--- a/reflector/DVHeaderPacket.h
+++ b/reflector/DVHeaderPacket.h
@@ -2,7 +2,7 @@
 
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 //
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DVLastFramePacket.cpp b/reflector/DVLastFramePacket.cpp
index 541c584..2bffede 100644
--- a/reflector/DVLastFramePacket.cpp
+++ b/reflector/DVLastFramePacket.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 //
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/DVLastFramePacket.h b/reflector/DVLastFramePacket.h
index c10f2cb..44c2f51 100644
--- a/reflector/DVLastFramePacket.h
+++ b/reflector/DVLastFramePacket.h
@@ -2,7 +2,7 @@
 
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 //
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/G3Client.cpp b/reflector/G3Client.cpp
index 5e89fc7..9b6cbc5 100644
--- a/reflector/G3Client.cpp
+++ b/reflector/G3Client.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2019 Marius Petrescu (YO2LOJ). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/G3Client.h b/reflector/G3Client.h
index 3fac01a..a4cf2d3 100644
--- a/reflector/G3Client.h
+++ b/reflector/G3Client.h
@@ -1,6 +1,6 @@
 //  Copyright © 2019 Marius Petrescu (YO2LOJ). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
@@ -34,7 +34,7 @@ public:
 	// identity
 	EProtocol GetProtocol(void) const           { return EProtocol::g3; }
 	const char *GetProtocolName(void) const     { return "Terminal/AP"; }
-	int GetCodec(void) const                    { return CODEC_AMBEPLUS; }
+	ECodecType GetCodec(void) const             { return ECodecType::dstar; }
 	bool IsNode(void) const                     { return true; }
 
 	// status
diff --git a/reflector/G3Protocol.cpp b/reflector/G3Protocol.cpp
index d538c63..ec3ee4e 100644
--- a/reflector/G3Protocol.cpp
+++ b/reflector/G3Protocol.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2019 Marius Petrescu (YO2LOJ). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/G3Protocol.h b/reflector/G3Protocol.h
index 5da0c32..e50901f 100644
--- a/reflector/G3Protocol.h
+++ b/reflector/G3Protocol.h
@@ -1,6 +1,6 @@
 //  Copyright © 2019 Marius Petrescu (YO2LOJ). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/GateKeeper.cpp b/reflector/GateKeeper.cpp
index 5f02908..a4a8cee 100644
--- a/reflector/GateKeeper.cpp
+++ b/reflector/GateKeeper.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/GateKeeper.h b/reflector/GateKeeper.h
index 490c7f1..a35316f 100644
--- a/reflector/GateKeeper.h
+++ b/reflector/GateKeeper.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/IP.cpp b/reflector/IP.cpp
index 44c58df..c3519e8 100644
--- a/reflector/IP.cpp
+++ b/reflector/IP.cpp
@@ -1,5 +1,5 @@
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/IP.h b/reflector/IP.h
index bedc054..9e989fc 100644
--- a/reflector/IP.h
+++ b/reflector/IP.h
@@ -1,7 +1,7 @@
 #pragma once
 
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/M17Client.cpp b/reflector/M17Client.cpp
index 1f866f0..c4cb8c4 100644
--- a/reflector/M17Client.cpp
+++ b/reflector/M17Client.cpp
@@ -1,4 +1,4 @@
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/M17Client.h b/reflector/M17Client.h
index 215fdf5..688fb38 100644
--- a/reflector/M17Client.h
+++ b/reflector/M17Client.h
@@ -1,6 +1,6 @@
 #pragma once
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/M17Protocol.cpp b/reflector/M17Protocol.cpp
index d9f1ef9..73adf33 100644
--- a/reflector/M17Protocol.cpp
+++ b/reflector/M17Protocol.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/M17Protocol.h b/reflector/M17Protocol.h
index 9d5af4f..d91830d 100644
--- a/reflector/M17Protocol.h
+++ b/reflector/M17Protocol.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Main.cpp b/reflector/Main.cpp
index 546964d..b478b7e 100644
--- a/reflector/Main.cpp
+++ b/reflector/Main.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Main.h b/reflector/Main.h
index 6569729..099d410 100644
--- a/reflector/Main.h
+++ b/reflector/Main.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Notification.cpp b/reflector/Notification.cpp
index aedb696..71208e3 100644
--- a/reflector/Notification.cpp
+++ b/reflector/Notification.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc. All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Notification.h b/reflector/Notification.h
index 53b6296..3db4e0b 100644
--- a/reflector/Notification.h
+++ b/reflector/Notification.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc. All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/NotificationQueue.h b/reflector/NotificationQueue.h
index ae5e644..57839ad 100644
--- a/reflector/NotificationQueue.h
+++ b/reflector/NotificationQueue.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc. All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Packet.cpp b/reflector/Packet.cpp
index d64b1df..f9fc95d 100644
--- a/reflector/Packet.cpp
+++ b/reflector/Packet.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Packet.h b/reflector/Packet.h
index 0561a1c..4335e92 100644
--- a/reflector/Packet.h
+++ b/reflector/Packet.h
@@ -2,7 +2,7 @@
 
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 //
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/PacketQueue.h b/reflector/PacketQueue.h
index 38ba786..fbea39a 100644
--- a/reflector/PacketQueue.h
+++ b/reflector/PacketQueue.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/PacketStream.cpp b/reflector/PacketStream.cpp
index 067bb57..1705c45 100644
--- a/reflector/PacketStream.cpp
+++ b/reflector/PacketStream.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
@@ -28,7 +28,7 @@ CPacketStream::CPacketStream()
 	m_uiStreamId = 0;
 	m_uiPacketCntr = 0;
 	m_OwnerClient = nullptr;
-#ifdef TRANSCODER_IP
+#ifdef TRANSCODED_MODULES
 	m_CodecStream = nullptr;
 #endif
 }
@@ -50,11 +50,11 @@ bool CPacketStream::OpenPacketStream(const CDvHeaderPacket &DvHeader, std::share
 		m_DvHeader = DvHeader;
 		m_OwnerClient = client;
 		m_LastPacketTime.start();
-#ifdef TRANSCODER_IP
+#ifdef TRANSCODED_MODULES
 		if (std::string::npos != std::string(TRANSCODED_MODULES).find(DvHeader.GetRpt2Module()))
 			m_CodecStream = g_Transcoder.GetCodecStream(this, client->GetCodec());
 		else
-			m_CodecStream = g_Transcoder.GetCodecStream(this, CODEC_NONE);
+			m_CodecStream = g_Transcoder.GetCodecStream(this, ECodecType::none);
 #endif
 		ok = true;
 	}
@@ -67,7 +67,7 @@ void CPacketStream::ClosePacketStream(void)
 	m_bOpen = false;
 	m_uiStreamId = 0;
 	m_OwnerClient = nullptr;
-#ifdef TRANSCODER_IP
+#ifdef TRANSCODED_MODULES
 	g_Transcoder.ReleaseStream(m_CodecStream);
 	m_CodecStream = nullptr;
 #endif
@@ -82,7 +82,7 @@ void CPacketStream::Push(std::unique_ptr<CPacket> Packet)
 	m_LastPacketTime.start();
 	Packet->UpdatePids(m_uiPacketCntr++);
 	// transcoder avaliable ?
-#ifdef TRANSCODER_IP
+#ifdef TRANSCODED_MODULES
 	if ( m_CodecStream != nullptr )
 	{
 		// todo: verify no possibilty of double lock here
@@ -114,7 +114,7 @@ void CPacketStream::Push(std::unique_ptr<CPacket> Packet)
 
 bool CPacketStream::IsEmpty(void) const
 {
-#ifdef TRANSCODER_IP
+#ifdef TRANSCODED_MODULES
 	bool bEmpty = empty();
 	// also check no packets still in Codec stream's queue
 	if ( bEmpty && (m_CodecStream != nullptr) )
diff --git a/reflector/PacketStream.h b/reflector/PacketStream.h
index fca9098..ebc1883 100644
--- a/reflector/PacketStream.h
+++ b/reflector/PacketStream.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
@@ -62,7 +62,7 @@ protected:
 	CTimer              m_LastPacketTime;
 	CDvHeaderPacket     m_DvHeader;
 	std::shared_ptr<CClient> m_OwnerClient;
-#ifdef TRANSCODER_IP
+#ifdef TRANSCODED_MODULES
 	std::shared_ptr<CCodecStream> m_CodecStream;
 #endif
 };
diff --git a/reflector/Peer.cpp b/reflector/Peer.cpp
index 216879d..e4b7c86 100644
--- a/reflector/Peer.cpp
+++ b/reflector/Peer.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2016 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Peer.h b/reflector/Peer.h
index 6d280cb..2d17387 100644
--- a/reflector/Peer.h
+++ b/reflector/Peer.h
@@ -1,6 +1,6 @@
 //  Copyright © 2016 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/PeerCallsignList.cpp b/reflector/PeerCallsignList.cpp
index 432067d..7b70951 100644
--- a/reflector/PeerCallsignList.cpp
+++ b/reflector/PeerCallsignList.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/PeerCallsignList.h b/reflector/PeerCallsignList.h
index 7527ed0..2ec8da6 100644
--- a/reflector/PeerCallsignList.h
+++ b/reflector/PeerCallsignList.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Peers.cpp b/reflector/Peers.cpp
index 20f0ca8..475602e 100644
--- a/reflector/Peers.cpp
+++ b/reflector/Peers.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2016 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Peers.h b/reflector/Peers.h
index 9fb2831..99512ca 100644
--- a/reflector/Peers.h
+++ b/reflector/Peers.h
@@ -1,6 +1,6 @@
 //  Copyright © 2016 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Protocol.cpp b/reflector/Protocol.cpp
index 5010a54..50527bc 100644
--- a/reflector/Protocol.cpp
+++ b/reflector/Protocol.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Protocol.h b/reflector/Protocol.h
index 8874528..67c2a2b 100644
--- a/reflector/Protocol.h
+++ b/reflector/Protocol.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Protocols.cpp b/reflector/Protocols.cpp
index 3095f8e..7dba043 100644
--- a/reflector/Protocols.cpp
+++ b/reflector/Protocols.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Protocols.h b/reflector/Protocols.h
index 3ef32ed..0dc4002 100644
--- a/reflector/Protocols.h
+++ b/reflector/Protocols.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/RawSocket.cpp b/reflector/RawSocket.cpp
index a763880..c8ee654 100644
--- a/reflector/RawSocket.cpp
+++ b/reflector/RawSocket.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2020 Marius Petrescu (YO2LOJ). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/RawSocket.h b/reflector/RawSocket.h
index 2b902b0..44a3989 100644
--- a/reflector/RawSocket.h
+++ b/reflector/RawSocket.h
@@ -1,6 +1,6 @@
 //  Copyright © 2020 Marius Petrescu (YO2LOJ). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Reflector.cpp b/reflector/Reflector.cpp
index 5ce575a..c2bf409 100644
--- a/reflector/Reflector.cpp
+++ b/reflector/Reflector.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
@@ -433,7 +433,6 @@ void CReflector::JsonReportThread()
 		std::cout << "Error creating monitor socket" << std::endl;
 	}
 }
-#endif
 
 ////////////////////////////////////////////////////////////////////////////////////////
 // notifications
@@ -482,6 +481,7 @@ void CReflector::OnStreamClose(const CCallsign &callsign)
 	m_Notifications.push(notification);
 	m_Notifications.Unlock();
 }
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////////////
 // modules & queues
diff --git a/reflector/Reflector.h b/reflector/Reflector.h
index 9e43b8c..e83bd91 100644
--- a/reflector/Reflector.h
+++ b/reflector/Reflector.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
@@ -133,10 +133,9 @@ protected:
 	std::future<void> m_XmlReportFuture;
 #ifdef JSON_MONITOR
 	std::future<void> m_JsonReportFuture;
-#endif
-
 	// notifications
 	CNotificationQueue  m_Notifications;
+#endif
 
 public:
 #ifdef DEBUG_DUMPFILE
diff --git a/reflector/Semaphore.cpp b/reflector/Semaphore.cpp
index 6ac4984..00c20a6 100644
--- a/reflector/Semaphore.cpp
+++ b/reflector/Semaphore.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Semaphore.h b/reflector/Semaphore.h
index c1c47cd..d7356a4 100644
--- a/reflector/Semaphore.h
+++ b/reflector/Semaphore.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Timer.h b/reflector/Timer.h
index 36eb4e0..9215eb9 100644
--- a/reflector/Timer.h
+++ b/reflector/Timer.h
@@ -1,4 +1,4 @@
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Transcoder.cpp b/reflector/Transcoder.cpp
index d1fb875..d226a89 100644
--- a/reflector/Transcoder.cpp
+++ b/reflector/Transcoder.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Transcoder.h b/reflector/Transcoder.h
index 45e3533..aa57997 100644
--- a/reflector/Transcoder.h
+++ b/reflector/Transcoder.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/UDPMsgSocket.cpp b/reflector/UDPMsgSocket.cpp
index 6db7d61..b2b0f29 100644
--- a/reflector/UDPMsgSocket.cpp
+++ b/reflector/UDPMsgSocket.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2020 Marius Petrescu (YO2LOJ). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/UDPMsgSocket.h b/reflector/UDPMsgSocket.h
index f92e894..a50bcaa 100644
--- a/reflector/UDPMsgSocket.h
+++ b/reflector/UDPMsgSocket.h
@@ -1,6 +1,6 @@
 //  Copyright © 2020 Marius Petrescu (YO2LOJ). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/UDPSocket.cpp b/reflector/UDPSocket.cpp
index 52d1bd5..6cc8608 100644
--- a/reflector/UDPSocket.cpp
+++ b/reflector/UDPSocket.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/UDPSocket.h b/reflector/UDPSocket.h
index 2d8864d..2a3e231 100644
--- a/reflector/UDPSocket.h
+++ b/reflector/UDPSocket.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/URFClient.cpp b/reflector/URFClient.cpp
index 3a4effc..db85982 100644
--- a/reflector/URFClient.cpp
+++ b/reflector/URFClient.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
@@ -41,27 +41,6 @@ CURFClient::CURFClient(const CURFClient &client)
 	m_ProtRev = client.m_ProtRev;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////
-// identity
-
-int CURFClient::GetCodec(void) const
-{
-	int codec;
-
-	switch ( GetProtocolRevision() )
-	{
-	case XLX_PROTOCOL_REVISION_0:
-	case XLX_PROTOCOL_REVISION_1:
-	default:
-		codec = CODEC_AMBEPLUS;
-		break;
-	case XLX_PROTOCOL_REVISION_2:
-		codec = CODEC_NONE;
-		break;
-	}
-	return codec;
-}
-
 ////////////////////////////////////////////////////////////////////////////////////////
 // status
 
diff --git a/reflector/URFClient.h b/reflector/URFClient.h
index 7befc19..ce6552d 100644
--- a/reflector/URFClient.h
+++ b/reflector/URFClient.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
@@ -39,7 +39,7 @@ public:
 	EProtocol GetProtocol(void) const           { return EProtocol::ulx; }
 	int GetProtocolRevision(void) const         { return m_ProtRev; }
 	const char *GetProtocolName(void) const     { return "XLX"; }
-	int GetCodec(void) const;
+	ECodecType GetCodec(void) const             { return ECodecType::none; }
 	bool IsPeer(void) const                     { return true; }
 
 	// status
diff --git a/reflector/URFPeer.cpp b/reflector/URFPeer.cpp
index a68125d..128924b 100644
--- a/reflector/URFPeer.cpp
+++ b/reflector/URFPeer.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2016 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/URFPeer.h b/reflector/URFPeer.h
index 5c308f6..71d51a7 100644
--- a/reflector/URFPeer.h
+++ b/reflector/URFPeer.h
@@ -1,6 +1,6 @@
 ///  Copyright © 2016 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/URFProtocol.cpp b/reflector/URFProtocol.cpp
index 1ab4a1d..bc29e67 100644
--- a/reflector/URFProtocol.cpp
+++ b/reflector/URFProtocol.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/URFProtocol.h b/reflector/URFProtocol.h
index c759c07..10544ba 100644
--- a/reflector/URFProtocol.h
+++ b/reflector/URFProtocol.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/User.cpp b/reflector/User.cpp
index d123167..64615bd 100644
--- a/reflector/User.cpp
+++ b/reflector/User.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/User.h b/reflector/User.h
index e154005..c9869fa 100644
--- a/reflector/User.h
+++ b/reflector/User.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Users.cpp b/reflector/Users.cpp
index 2b99fc3..1406e18 100644
--- a/reflector/Users.cpp
+++ b/reflector/Users.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Users.h b/reflector/Users.h
index 259f7f5..6216269 100644
--- a/reflector/Users.h
+++ b/reflector/Users.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Version.cpp b/reflector/Version.cpp
index 7c809f2..96d296d 100644
--- a/reflector/Version.cpp
+++ b/reflector/Version.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/Version.h b/reflector/Version.h
index dedea85..256bfd8 100644
--- a/reflector/Version.h
+++ b/reflector/Version.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/WiresXCmd.cpp b/reflector/WiresXCmd.cpp
index 382509c..225538f 100644
--- a/reflector/WiresXCmd.cpp
+++ b/reflector/WiresXCmd.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2019 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/WiresXCmd.h b/reflector/WiresXCmd.h
index a0dbce7..cd2d096 100644
--- a/reflector/WiresXCmd.h
+++ b/reflector/WiresXCmd.h
@@ -1,6 +1,6 @@
 //  Copyright © 2019 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/WiresXCmdHandler.cpp b/reflector/WiresXCmdHandler.cpp
index 5a4311e..ab1360e 100644
--- a/reflector/WiresXCmdHandler.cpp
+++ b/reflector/WiresXCmdHandler.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2019 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/WiresXCmdHandler.h b/reflector/WiresXCmdHandler.h
index 797394f..d2873e7 100644
--- a/reflector/WiresXCmdHandler.h
+++ b/reflector/WiresXCmdHandler.h
@@ -1,6 +1,6 @@
 //  Copyright © 2019 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/WiresXCmdQueue.h b/reflector/WiresXCmdQueue.h
index 50cca68..7e3a7d7 100644
--- a/reflector/WiresXCmdQueue.h
+++ b/reflector/WiresXCmdQueue.h
@@ -1,6 +1,6 @@
 //  Copyright © 2019 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/WiresXInfo.cpp b/reflector/WiresXInfo.cpp
index d62efdd..3da1fb6 100644
--- a/reflector/WiresXInfo.cpp
+++ b/reflector/WiresXInfo.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2019 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/WiresXInfo.h b/reflector/WiresXInfo.h
index 43b8643..886eed4 100644
--- a/reflector/WiresXInfo.h
+++ b/reflector/WiresXInfo.h
@@ -1,6 +1,6 @@
 //  Copyright © 2019 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/WiresXPacket.h b/reflector/WiresXPacket.h
index f018396..3e27fb6 100644
--- a/reflector/WiresXPacket.h
+++ b/reflector/WiresXPacket.h
@@ -1,6 +1,6 @@
 //  Copyright © 2019 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/WiresXPacketQueue.h b/reflector/WiresXPacketQueue.h
index ae456ec..fb90297 100644
--- a/reflector/WiresXPacketQueue.h
+++ b/reflector/WiresXPacketQueue.h
@@ -1,6 +1,6 @@
 //  Copyright © 2019 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/YSFClient.cpp b/reflector/YSFClient.cpp
index b5eb79c..58c3b47 100644
--- a/reflector/YSFClient.cpp
+++ b/reflector/YSFClient.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/YSFClient.h b/reflector/YSFClient.h
index ef38b9d..e8c0e9d 100644
--- a/reflector/YSFClient.h
+++ b/reflector/YSFClient.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
@@ -33,7 +33,7 @@ public:
 	// identity
 	EProtocol GetProtocol(void) const           { return EProtocol::ysf; }
 	const char *GetProtocolName(void) const     { return "YSF"; }
-	int GetCodec(void) const                    { return CODEC_AMBE2PLUS; }
+	ECodecType GetCodec(void) const             { return ECodecType::dmr; }
 	bool IsNode(void) const                     { return true; }
 
 	// status
diff --git a/reflector/YSFConvolution.cpp b/reflector/YSFConvolution.cpp
index 0c32003..8f0c22f 100644
--- a/reflector/YSFConvolution.cpp
+++ b/reflector/YSFConvolution.cpp
@@ -1,6 +1,6 @@
 //   Copyright (C) 2009-2016 by Jonathan Naylor G4KLX
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/YSFNode.cpp b/reflector/YSFNode.cpp
index 917838c..2b4d626 100644
--- a/reflector/YSFNode.cpp
+++ b/reflector/YSFNode.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2019 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/YSFNode.h b/reflector/YSFNode.h
index 76758d7..dd5ca81 100644
--- a/reflector/YSFNode.h
+++ b/reflector/YSFNode.h
@@ -1,6 +1,6 @@
 //  Copyright © 2019 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/YSFNodeDir.cpp b/reflector/YSFNodeDir.cpp
index b2d4a58..7f11b34 100644
--- a/reflector/YSFNodeDir.cpp
+++ b/reflector/YSFNodeDir.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2019 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/YSFNodeDir.h b/reflector/YSFNodeDir.h
index f51e00a..26b5911 100644
--- a/reflector/YSFNodeDir.h
+++ b/reflector/YSFNodeDir.h
@@ -1,6 +1,6 @@
 //  Copyright © 2019 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/YSFNodeDirFile.cpp b/reflector/YSFNodeDirFile.cpp
index f1ed702..5879c5e 100644
--- a/reflector/YSFNodeDirFile.cpp
+++ b/reflector/YSFNodeDirFile.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2019 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/YSFNodeDirFile.h b/reflector/YSFNodeDirFile.h
index 01d20d2..8b15993 100644
--- a/reflector/YSFNodeDirFile.h
+++ b/reflector/YSFNodeDirFile.h
@@ -1,6 +1,6 @@
 //  Copyright © 2019 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/YSFNodeDirHttp.cpp b/reflector/YSFNodeDirHttp.cpp
index 4e5885f..a20b67d 100644
--- a/reflector/YSFNodeDirHttp.cpp
+++ b/reflector/YSFNodeDirHttp.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2019 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/YSFNodeDirHttp.h b/reflector/YSFNodeDirHttp.h
index 83c3956..c697f91 100644
--- a/reflector/YSFNodeDirHttp.h
+++ b/reflector/YSFNodeDirHttp.h
@@ -1,6 +1,6 @@
 //  Copyright © 2019 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/YSFProtocol.cpp b/reflector/YSFProtocol.cpp
index 4f0f171..a75fbd1 100644
--- a/reflector/YSFProtocol.cpp
+++ b/reflector/YSFProtocol.cpp
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/YSFProtocol.h b/reflector/YSFProtocol.h
index 4f22250..0bb1d8f 100644
--- a/reflector/YSFProtocol.h
+++ b/reflector/YSFProtocol.h
@@ -1,6 +1,6 @@
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/YSFUtils.cpp b/reflector/YSFUtils.cpp
index 426c687..1c8d215 100644
--- a/reflector/YSFUtils.cpp
+++ b/reflector/YSFUtils.cpp
@@ -3,7 +3,7 @@
 //  Copyright (C) 2018 by Andy Uribe CA6JAU
 //  Copyright (C) 2018 by Manuel Sanchez EA7EE
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/reflector/YSFUtils.h b/reflector/YSFUtils.h
index dda4e3b..6805c66 100644
--- a/reflector/YSFUtils.h
+++ b/reflector/YSFUtils.h
@@ -3,7 +3,7 @@
 //  Copyright (C) 2018 by Andy Uribe CA6JAU
 //  Copyright (C) 2018 by Manuel Sanchez EA7EE
 
-// ulxd -- The universal reflector
+// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify