diff --git a/source/blender/depsgraph/intern/node/deg_node_component.cc b/source/blender/depsgraph/intern/node/deg_node_component.cc
index 6ef3ea8aeab..b378680911e 100644
--- a/source/blender/depsgraph/intern/node/deg_node_component.cc
+++ b/source/blender/depsgraph/intern/node/deg_node_component.cc
@@ -54,7 +54,7 @@ string ComponentNode::OperationIDKey::identifier() const
 
 bool ComponentNode::OperationIDKey::operator==(const OperationIDKey &other) const
 {
-  return (opcode == other.opcode) && STREQ(name, other.name) && (name_tag == other.name_tag);
+  return (opcode == other.opcode) && (name == other.name) && (name_tag == other.name_tag);
 }
 
 uint64_t ComponentNode::OperationIDKey::hash() const
@@ -63,7 +63,7 @@ uint64_t ComponentNode::OperationIDKey::hash() const
   return BLI_ghashutil_combine_hash(
       name_tag,
       BLI_ghashutil_combine_hash(BLI_ghashutil_uinthash(opcode_as_int),
-                                 BLI_ghashutil_strhash_p(name)));
+                                 BLI_ghashutil_strhash_p(name.c_str())));
 }
 
 ComponentNode::ComponentNode()
@@ -106,7 +106,7 @@ OperationNode *ComponentNode::find_operation(OperationIDKey key) const
   else {
     for (OperationNode *op_node : operations) {
       if (op_node->opcode == key.opcode && op_node->name_tag == key.name_tag &&
-          STREQ(op_node->name.c_str(), key.name)) {
+          op_node->name == key.name) {
         node = op_node;
         break;
       }
diff --git a/source/blender/depsgraph/intern/node/deg_node_component.h b/source/blender/depsgraph/intern/node/deg_node_component.h
index 6109bb11167..59ff59dbdd6 100644
--- a/source/blender/depsgraph/intern/node/deg_node_component.h
+++ b/source/blender/depsgraph/intern/node/deg_node_component.h
@@ -33,7 +33,7 @@ struct ComponentNode : public Node {
   /* Key used to look up operations within a component */
   struct OperationIDKey {
     OperationCode opcode;
-    const char *name;
+    string name;
     int name_tag;
 
     OperationIDKey();
diff --git a/source/blender/depsgraph/intern/node/deg_node_id.cc b/source/blender/depsgraph/intern/node/deg_node_id.cc
index 5baff0c92d9..ba894ceb0ee 100644
--- a/source/blender/depsgraph/intern/node/deg_node_id.cc
+++ b/source/blender/depsgraph/intern/node/deg_node_id.cc
@@ -45,14 +45,14 @@ IDNode::ComponentIDKey::ComponentIDKey(NodeType type, const char *name) : type(t
 
 bool IDNode::ComponentIDKey::operator==(const ComponentIDKey &other) const
 {
-  return type == other.type && STREQ(name, other.name);
+  return type == other.type && name == other.name;
 }
 
 uint64_t IDNode::ComponentIDKey::hash() const
 {
   const int type_as_int = int(type);
   return BLI_ghashutil_combine_hash(BLI_ghashutil_uinthash(type_as_int),
-                                    BLI_ghashutil_strhash_p(name));
+                                    BLI_ghashutil_strhash_p(name.c_str()));
 }
 
 void IDNode::init(const ID *id, const char * /*subdata*/)
diff --git a/source/blender/depsgraph/intern/node/deg_node_id.h b/source/blender/depsgraph/intern/node/deg_node_id.h
index 194a1bf8ba5..07bcc626099 100644
--- a/source/blender/depsgraph/intern/node/deg_node_id.h
+++ b/source/blender/depsgraph/intern/node/deg_node_id.h
@@ -38,7 +38,7 @@ struct IDNode : public Node {
     bool operator==(const ComponentIDKey &other) const;
 
     NodeType type;
-    const char *name;
+    string name;
   };
 
   /** Initialize 'id' node - from pointer data given. */