diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index c96cb8d667..209240533b 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -368,7 +368,7 @@ bool EntityTree::updateEntity(EntityItemPointer entity, const EntityItemProperti
             }
         }
     } else {
-        if (getIsServer()) {
+        if (isEntityServer()) {
             bool simulationBlocked = !entity->getSimulatorID().isNull();
             if (properties.simulationOwnerChanged()) {
                 QUuid submittedID = properties.getSimulationOwner().getID();
@@ -674,7 +674,7 @@ void EntityTree::deleteEntitiesByID(const std::vector<EntityItemID>& ids, bool f
     // this method has two paths:
     // (a) entity-server: applies delete filter
     // (b) interface-client: deletes local- and my-avatar-entities immediately, submits domainEntity deletes to the entity-server
-    if (getIsServer()) {
+    if (isEntityServer()) {
         withWriteLock([&] {
             std::vector<EntityItemPointer> entitiesToDelete;
             entitiesToDelete.reserve(ids.size());
@@ -1468,7 +1468,7 @@ bool EntityTree::isScriptInAllowlist(const QString& scriptProperty) {
 // NOTE: Caller must lock the tree before calling this.
 int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned char* editData, int maxLength,
                                      const SharedNodePointer& senderNode) {
-    if (!getIsServer()) {
+    if (!isEntityServer()) {
         qCWarning(entities) << "EntityTree::processEditPacketData() should only be called on a server tree.";
         return 0;
     }
@@ -2071,7 +2071,7 @@ int EntityTree::processEraseMessage(ReceivedMessage& message, const SharedNodePo
     // Which means this is a state synchronization message from the the entity-server.  It is saying
     // "The following domain-entities have already been deleted". While need to perform sanity checking
     // (e.g. verify these are domain entities) permissions need NOT checked for the domain-entities.
-    assert(!getIsServer());
+    assert(!isEntityServer());
     // TODO: remove this stuff out of EntityTree:: and into interface-client code.
     #ifdef EXTRA_ERASE_DEBUGGING
         qCDebug(entities) << "EntityTree::processEraseMessage()";
@@ -2141,7 +2141,7 @@ int EntityTree::processEraseMessage(ReceivedMessage& message, const SharedNodePo
 int EntityTree::processEraseMessageDetails(const QByteArray& dataByteArray, const SharedNodePointer& sourceNode) {
     // NOTE: this is called on entity-server when receiving a delete request from an interface-client or agent
     //TODO: assert(treeIsLocked);
-    assert(getIsServer());
+    assert(isEntityServer());
     #ifdef EXTRA_ERASE_DEBUGGING
         qCDebug(entities) << "EntityTree::processEraseMessageDetails()";
     #endif