From 65b6dd04296f51b81fd21900c153e5486f2a5f12 Mon Sep 17 00:00:00 2001
From: visi <visi@vertex.link>
Date: Tue, 23 Dec 2025 14:30:34 -0500
Subject: [PATCH] Clean up risk:tool:software name/names props

---
 synapse/models/risk.py           | 14 ++------------
 synapse/tests/test_model_risk.py | 10 +++++-----
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/synapse/models/risk.py b/synapse/models/risk.py
index bf2ec9c000..d30d34c7dd 100644
--- a/synapse/models/risk.py
+++ b/synapse/models/risk.py
@@ -176,8 +176,8 @@ async def _normPyStr(self, text, view=None):
                 ),
                 'display': {
                     'columns': (
-                        {'type': 'prop', 'opts': {'name': 'software:name'}},
-                        {'type': 'prop', 'opts': {'name': 'software:names'}},
+                        {'type': 'prop', 'opts': {'name': 'name'}},
+                        {'type': 'prop', 'opts': {'name': 'names'}},
                         {'type': 'prop', 'opts': {'name': 'reporter:name'}},
                         {'type': 'prop', 'opts': {'name': 'tag'}},
                     ),
@@ -394,16 +394,6 @@ async def _normPyStr(self, text, view=None):
                 ('software', ('it:software', {}), {
                     'prevnames': ('soft',),
                     'doc': 'The authoritative software family for the tool.'}),
-
-                ('software:name', ('meta:name', {}), {
-                    'alts': ('software:names',),
-                    'prevnames': ('soft:name',),
-                    'doc': "The source's name for the tool."}),
-
-                ('software:names', ('array', {'type': 'meta:name'}), {
-                    'prevnames': ('soft:names',),
-                    'doc': "The source's alternate names for the tool."}),
-
             )),
             ('risk:mitigation:type:taxonomy', {}, ()),
             ('risk:mitigation', {}, (
diff --git a/synapse/tests/test_model_risk.py b/synapse/tests/test_model_risk.py
index c68fd95c7d..24cd7cfa56 100644
--- a/synapse/tests/test_model_risk.py
+++ b/synapse/tests/test_model_risk.py
@@ -480,8 +480,8 @@ async def test_model_risk_tool_software(self):
                 [ risk:tool:software=*
                     :software=*
                     :used=(2012,?)
-                    :software:name=cobaltstrike
-                    :software:names=(beacon,)
+                    :name=cobaltstrike
+                    :names=(beacon,)
                     :reporter={[ ou:org=({"name": "vertex"}) ]}
                     :reporter:name=vertex
                     :reporter:discovered=202202
@@ -506,14 +506,14 @@ async def test_model_risk_tool_software(self):
             self.eq(1675209600000000, nodes[0].get('reporter:published'))
             self.eq('AAAbbb123', nodes[0].get('id'))
 
-            self.eq('cobaltstrike', nodes[0].get('software:name'))
-            self.eq(('beacon',), nodes[0].get('software:names'))
+            self.eq('cobaltstrike', nodes[0].get('name'))
+            self.eq(('beacon',), nodes[0].get('names'))
 
             self.len(1, await core.nodes('risk:tool:software -> ou:org'))
             self.len(1, await core.nodes('risk:tool:software -> syn:tag'))
             self.len(1, await core.nodes('risk:tool:software -> it:software'))
 
-            self.len(1, nodes := await core.nodes('[ risk:tool:software=({"software:name": "beacon"}) ]'))
+            self.len(1, nodes := await core.nodes('[ risk:tool:software=({"name": "beacon"}) ]'))
             self.eq(node.ndef, nodes[0].ndef)
 
     async def test_model_risk_vuln_technique(self):