diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 2f2b424948..9fb0a96382 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -119,7 +119,7 @@ void AudioMixer::queueReplicatedAudioPacket(QSharedPointer<ReceivedMessage> mess
 
     QUuid nodeID =  QUuid::fromRfc4122(message->readWithoutCopy(NUM_BYTES_RFC4122_UUID));
 
-    auto node = nodeList->addOrUpdateNode(nodeID, NodeType::ReplicatedAgent,
+    auto node = nodeList->addOrUpdateNode(nodeID, NodeType::Agent,
                                           message->getSenderSockAddr(), message->getSenderSockAddr(),
                                           DEFAULT_AGENT_PERMISSIONS, true);
     node->setIsUpstream(true);
diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp
index 6ef795f57b..b95ca5b616 100644
--- a/assignment-client/src/audio/AudioMixerClientData.cpp
+++ b/assignment-client/src/audio/AudioMixerClientData.cpp
@@ -74,7 +74,7 @@ void AudioMixerClientData::processPackets() {
             case PacketType::ReplicatedInjectAudio:
             case PacketType::ReplicatedSilentAudioFrame: {
 
-                if (node->getType() == NodeType::ReplicatedAgent && !_codec) {
+                if (node->isUpstream() && !_codec) {
                     setupCodecForReplicatedAgent(packet);
                 }
 
@@ -140,7 +140,7 @@ void AudioMixerClientData::replicatePacket(ReceivedMessage& message) {
 
     // enumerate the replicant audio mixers and send them the replicated version of this packet
     nodeList->eachMatchingNode([&](const SharedNodePointer& node)->bool {
-        return node->getType() == NodeType::ReplicantAudioMixer;
+        return node->getType() == NodeType::DownstreamAudioMixer;
     }, [&](const SharedNodePointer& node) {
         nodeList->sendUnreliablePacket(*packet, node->getPublicSocket());
     });
diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index afb0dce8af..7ca991667e 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -744,7 +744,7 @@ void LimitedNodeList::removeSilentNodes() {
         SharedNodePointer node = it->second;
         node->getMutex().lock();
 
-        if (node->getType() != NodeType::ReplicantAudioMixer && node->getType() != NodeType::ReplicantAvatarMixer
+        if (node->getType() != NodeType::DownstreamAudioMixer && node->getType() != NodeType::DownstreamAvatarMixer
             && (usecTimestampNow() - node->getLastHeardMicrostamp()) > (NODE_SILENCE_THRESHOLD_MSECS * USECS_PER_MSEC)) {
             // call the NodeHash erase to get rid of this node
             it = _nodeHash.unsafe_erase(it);
diff --git a/libraries/networking/src/Node.cpp b/libraries/networking/src/Node.cpp
index a6b6bc18b2..9331487db9 100644
--- a/libraries/networking/src/Node.cpp
+++ b/libraries/networking/src/Node.cpp
@@ -42,9 +42,8 @@ void NodeType::init() {
     TypeNameHash.insert(NodeType::MessagesMixer, "Messages Mixer");
     TypeNameHash.insert(NodeType::AssetServer, "Asset Server");
     TypeNameHash.insert(NodeType::EntityScriptServer, "Entity Script Server");
-    TypeNameHash.insert(NodeType::ReplicantAudioMixer, "Replicant Audio Mixer");
-    TypeNameHash.insert(NodeType::ReplicantAvatarMixer, "Replicant Avatar Mixer");
-    TypeNameHash.insert(NodeType::ReplicatedAgent, "Replicated Agent");
+    TypeNameHash.insert(NodeType::DownstreamAudioMixer, "Downstream Audio Mixer");
+    TypeNameHash.insert(NodeType::DownstreamAvatarMixer, "Downstream Avatar Mixer");
     TypeNameHash.insert(NodeType::Unassigned, "Unassigned");
 }
 
diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index 5e06ad2b5c..ddd2137422 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -714,7 +714,7 @@ void NodeList::pingPunchForInactiveNode(const SharedNodePointer& node) {
 void NodeList::startNodeHolePunch(const SharedNodePointer& node) {
 
     // we don't hole punch to replicants, since it is assumed that we have a direct line to them
-    if (node->getType() != NodeType::ReplicantAudioMixer && node->getType() != NodeType::ReplicantAvatarMixer) {
+    if (node->getType() != NodeType::DownstreamAudioMixer && node->getType() != NodeType::DownstreamAvatarMixer) {
         // connect to the correct signal on this node so we know when to ping it
         connect(node.data(), &Node::pingTimerTimeout, this, &NodeList::handleNodePingTimeout);
 
diff --git a/libraries/networking/src/NodeType.h b/libraries/networking/src/NodeType.h
index 7c327e08f7..7f0d5f0636 100644
--- a/libraries/networking/src/NodeType.h
+++ b/libraries/networking/src/NodeType.h
@@ -25,9 +25,8 @@ namespace NodeType {
     const NodeType_t AssetServer = 'A';
     const NodeType_t MessagesMixer = 'm';
     const NodeType_t EntityScriptServer = 'S';
-    const NodeType_t ReplicantAudioMixer = 'a';
-    const NodeType_t ReplicantAvatarMixer = 'w';
-    const NodeType_t ReplicatedAgent = 'z';
+    const NodeType_t DownstreamAudioMixer = 'a';
+    const NodeType_t DownstreamAvatarMixer = 'w';
     const NodeType_t Unassigned = 1;
 
     void init();