diff --git a/DMRNetwork.cpp b/DMRNetwork.cpp
index 65ebc62..3bd9a18 100644
--- a/DMRNetwork.cpp
+++ b/DMRNetwork.cpp
@@ -31,7 +31,7 @@ const unsigned int BUFFER_LENGTH = 500U;
 const unsigned int HOMEBREW_DATA_PACKET_LENGTH = 55U;
 
 
-CDMRNetwork::CDMRNetwork(const std::string& address, unsigned int port, unsigned int local, unsigned int id, const std::string& password, char* name, bool debug) :
+CDMRNetwork::CDMRNetwork(const std::string& address, unsigned int port, unsigned int local, unsigned int id, const std::string& password, const char* name, bool debug) :
 m_address(),
 m_port(port),
 m_id(NULL),
diff --git a/DMRNetwork.h b/DMRNetwork.h
index 70fe795..8a9cfcb 100644
--- a/DMRNetwork.h
+++ b/DMRNetwork.h
@@ -30,7 +30,7 @@
 class CDMRNetwork
 {
 public:
-	CDMRNetwork(const std::string& address, unsigned int port, unsigned int local, unsigned int id, const std::string& password, char* name, bool debug);
+	CDMRNetwork(const std::string& address, unsigned int port, unsigned int local, unsigned int id, const std::string& password, const char* name, bool debug);
 	~CDMRNetwork();
 
 	void setOptions(const std::string& options);
@@ -54,7 +54,7 @@ private:
 	unsigned int m_port;
 	uint8_t*     m_id;
 	std::string  m_password;
-	char*        m_name;
+	const char*  m_name;
 	bool         m_debug;
 	CUDPSocket   m_socket;
 
diff --git a/MMDVMNetwork.h b/MMDVMNetwork.h
index 6abc252..620a82b 100644
--- a/MMDVMNetwork.h
+++ b/MMDVMNetwork.h
@@ -50,18 +50,18 @@ public:
 	void close();
 
 private: 
-	in_addr        m_rptAddress;
-	unsigned int   m_rptPort;
-	unsigned int   m_id;
-	unsigned char* m_netId;
-	bool           m_debug;
-	CUDPSocket     m_socket;
-	unsigned char* m_buffer;
-	std::string    m_options;
-	unsigned char* m_configData;
-	unsigned int   m_configLen;
-
+	in_addr                    m_rptAddress;
+	unsigned int               m_rptPort;
+	unsigned int               m_id;
+	unsigned char*             m_netId;
+	bool                       m_debug;
+	CUDPSocket                 m_socket;
+	unsigned char*             m_buffer;
 	CRingBuffer<unsigned char> m_rxData;
+	std::string                m_options;
+	unsigned char*             m_configData;
+	unsigned int               m_configLen;
+
 };
 
 #endif