diff --git a/libraries/shared/src/NetworkPacket.cpp b/libraries/shared/src/NetworkPacket.cpp
index 99dc00e9e2..a3d6e5558d 100644
--- a/libraries/shared/src/NetworkPacket.cpp
+++ b/libraries/shared/src/NetworkPacket.cpp
@@ -17,13 +17,13 @@ NetworkPacket::NetworkPacket()  : _packetLength(0) {
 }
 
 NetworkPacket::NetworkPacket(const NetworkPacket& packet) {
-    memcpy(&_senderAddress, &packet.getSenderAddress(), sizeof(_senderAddress));
+    memcpy(&_address, &packet.getAddress(), sizeof(_address));
     _packetLength = packet.getLength();
     memcpy(&_packetData[0], packet.getData(), _packetLength);
 }
 
-NetworkPacket::NetworkPacket(sockaddr& senderAddress, unsigned char*  packetData, ssize_t packetLength) {
-    memcpy(&_senderAddress, &senderAddress, sizeof(_senderAddress));
+NetworkPacket::NetworkPacket(sockaddr& address, unsigned char*  packetData, ssize_t packetLength) {
+    memcpy(&_address, &address, sizeof(_address));
     _packetLength = packetLength;
     memcpy(&_packetData[0], packetData, packetLength);
 };
diff --git a/libraries/shared/src/NetworkPacket.h b/libraries/shared/src/NetworkPacket.h
index 9f35004443..4c7f2e4466 100644
--- a/libraries/shared/src/NetworkPacket.h
+++ b/libraries/shared/src/NetworkPacket.h
@@ -19,20 +19,19 @@
 
 class NetworkPacket {
 public:
-    NetworkPacket(sockaddr& senderAddress, unsigned char*  packetData, ssize_t packetLength);
+    NetworkPacket(sockaddr& address, unsigned char*  packetData, ssize_t packetLength);
     NetworkPacket(const NetworkPacket& packet);
     NetworkPacket();
-    //~NetworkPacket();
     
-    sockaddr&      getSenderAddress() { return _senderAddress; };
+    sockaddr&      getAddress()       { return _address; };
     ssize_t        getLength() const  { return _packetLength;  };
     unsigned char* getData()          { return &_packetData[0]; };
 
-    const sockaddr&      getSenderAddress() const { return _senderAddress; };
-    const unsigned char* getData() const { return &_packetData[0]; };
+    const sockaddr&      getAddress() const { return _address; };
+    const unsigned char* getData() const    { return &_packetData[0]; };
 
 private:
-    sockaddr        _senderAddress;
+    sockaddr        _address;
     ssize_t         _packetLength;
     unsigned char   _packetData[MAX_PACKET_SIZE];
 };
diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp
index 6c2647efd5..23b39df205 100644
--- a/libraries/shared/src/NodeList.cpp
+++ b/libraries/shared/src/NodeList.cpp
@@ -439,7 +439,7 @@ void NodeList::addNodeToList(Node* newNode) {
     notifyHooksOfAddedNode(newNode);
 }
 
-unsigned NodeList::broadcastToNodes(unsigned char *broadcastData, size_t dataBytes, const char* nodeTypes, int numNodeTypes) {
+unsigned NodeList::broadcastToNodes(unsigned char* broadcastData, size_t dataBytes, const char* nodeTypes, int numNodeTypes) {
     unsigned n = 0;
     for(NodeList::iterator node = begin(); node != end(); node++) {
         // only send to the NodeTypes we are asked to send to.
diff --git a/libraries/shared/src/PacketReceiver.cpp b/libraries/shared/src/PacketReceiver.cpp
index 39542eb21e..0f7d9ab1ab 100644
--- a/libraries/shared/src/PacketReceiver.cpp
+++ b/libraries/shared/src/PacketReceiver.cpp
@@ -10,14 +10,14 @@
 
 #include "PacketReceiver.h"
 
-void PacketReceiver::queuePacket(sockaddr& senderAddress, unsigned char* packetData, ssize_t packetLength) {
-    _packets.push_back(NetworkPacket(senderAddress, packetData, packetLength));
+void PacketReceiver::queuePacket(sockaddr& address, unsigned char* packetData, ssize_t packetLength) {
+    _packets.push_back(NetworkPacket(address, packetData, packetLength));
 }
 
 bool PacketReceiver::process() {
     while (_packets.size() > 0) {
         NetworkPacket& packet = _packets.front();
-        processPacket(packet.getSenderAddress(), packet.getData(), packet.getLength());
+        processPacket(packet.getAddress(), packet.getData(), packet.getLength());
         _packets.erase(_packets.begin());
     }
     return true;  // keep running till they terminate us
diff --git a/libraries/shared/src/PacketReceiver.h b/libraries/shared/src/PacketReceiver.h
index c4dabb4906..27ab68f5de 100644
--- a/libraries/shared/src/PacketReceiver.h
+++ b/libraries/shared/src/PacketReceiver.h
@@ -29,6 +29,4 @@ private:
     std::vector<NetworkPacket> _packets;
 };
 
-extern "C" void* PacketReceiverThreadEntry(void* arg);
-
 #endif // __shared__PacketReceiver__