diff --git a/libraries/shared/src/Agent.cpp b/libraries/shared/src/Agent.cpp
index 93925a04a5..b329b7faaa 100644
--- a/libraries/shared/src/Agent.cpp
+++ b/libraries/shared/src/Agent.cpp
@@ -37,7 +37,7 @@ Agent::Agent(sockaddr *agentPublicSocket, sockaddr *agentLocalSocket, char agent
     
     activeSocket = NULL;
     linkedData = NULL;
-    _movingAverage = NULL;
+    _bytesReceivedMovingAverage = NULL;
     
     deleteMutex = new pthread_mutex_t;
     pthread_mutex_init(deleteMutex, NULL);
@@ -70,11 +70,11 @@ Agent::Agent(const Agent &otherAgent) {
         linkedData = NULL;
     }
     
-    if (otherAgent._movingAverage != NULL) {
-        _movingAverage = new SimpleMovingAverage(100);
-        memcpy(_movingAverage, otherAgent._movingAverage, sizeof(SimpleMovingAverage));
+    if (otherAgent._bytesReceivedMovingAverage != NULL) {
+        _bytesReceivedMovingAverage = new SimpleMovingAverage(100);
+        memcpy(_bytesReceivedMovingAverage, otherAgent._bytesReceivedMovingAverage, sizeof(SimpleMovingAverage));
     } else {
-        _movingAverage = NULL;
+        _bytesReceivedMovingAverage = NULL;
     }
     
     deleteMutex = new pthread_mutex_t;
@@ -97,7 +97,7 @@ void Agent::swap(Agent &first, Agent &second) {
     swap(first.agentId, second.agentId);
     swap(first.firstRecvTimeUsecs, second.firstRecvTimeUsecs);
     swap(first.lastRecvTimeUsecs, second.lastRecvTimeUsecs);
-    swap(first._movingAverage, second._movingAverage);
+    swap(first._bytesReceivedMovingAverage, second._bytesReceivedMovingAverage);
     swap(first.deleteMutex, second.deleteMutex);
 }
 
@@ -108,7 +108,7 @@ Agent::~Agent() {
     delete publicSocket;
     delete localSocket;
     delete linkedData;
-    delete _movingAverage;
+    delete _bytesReceivedMovingAverage;
 }
 
 char Agent::getType() const {
@@ -209,7 +209,6 @@ void Agent::setLinkedData(AgentData *newData) {
     linkedData = newData;
 }
 
-
 bool Agent::operator==(const Agent& otherAgent) {
     return matches(otherAgent.publicSocket, otherAgent.localSocket, otherAgent.type);
 }
@@ -222,25 +221,25 @@ bool Agent::matches(sockaddr *otherPublicSocket, sockaddr *otherLocalSocket, cha
 }
 
 void Agent::recordBytesReceived(int bytesReceived) {
-    if (_movingAverage == NULL) {
+    if (_bytesReceivedMovingAverage == NULL) {
         printf("Setting up the moving average for agent\n");
-        _movingAverage = new SimpleMovingAverage(100);
+        _bytesReceivedMovingAverage = new SimpleMovingAverage(100);
     }
     
-    _movingAverage->updateAverage((float) bytesReceived);
+    _bytesReceivedMovingAverage->updateAverage((float) bytesReceived);
 }
 
 float Agent::getAveragePacketsPerSecond() {
-    if (_movingAverage != NULL) {
-        return (1 / _movingAverage->getEventDeltaAverage());
+    if (_bytesReceivedMovingAverage != NULL) {
+        return (1 / _bytesReceivedMovingAverage->getEventDeltaAverage());
     } else {
         return 0;
     }
 }
 
 float Agent::getAverageKilobitsPerSecond() {
-    if (_movingAverage != NULL) {
-        return (_movingAverage->getAverageSampleValuePerSecond() * (8.0f / 1000));
+    if (_bytesReceivedMovingAverage != NULL) {
+        return (_bytesReceivedMovingAverage->getAverageSampleValuePerSecond() * (8.0f / 1000));
     } else {
         return 0;
     }
diff --git a/libraries/shared/src/Agent.h b/libraries/shared/src/Agent.h
index 99773633b5..14942defcb 100644
--- a/libraries/shared/src/Agent.h
+++ b/libraries/shared/src/Agent.h
@@ -72,7 +72,7 @@ private:
     uint16_t agentId;
     double firstRecvTimeUsecs;
     double lastRecvTimeUsecs;
-    SimpleMovingAverage* _movingAverage;
+    SimpleMovingAverage* _bytesReceivedMovingAverage;
     AgentData* linkedData;
     
 };