diff --git a/docs/resource/zos.md b/docs/resource/zos.md
index 96b8c7169..e14c825e0 100644
--- a/docs/resource/zos.md
+++ b/docs/resource/zos.md
@@ -3,7 +3,7 @@
 
 This document defines z/OS software entity and documents how to populate other entities, such as `host` in the context of mainframes.
 
-<!-- semconv resource.zos.software -->
+<!-- semconv entity.zos.software -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/model/zos/resources.yaml b/model/zos/common.yaml
similarity index 91%
rename from model/zos/resources.yaml
rename to model/zos/common.yaml
index 88b672663..d07e8112c 100644
--- a/model/zos/resources.yaml
+++ b/model/zos/common.yaml
@@ -1,15 +1,4 @@
 groups:
-  - id: resource.zos.software
-    type: resource
-    stability: development
-    name: zos.software
-    brief: A software resource running on a z/OS system.
-    attributes:
-      - ref: zos.sysplex.name
-        requirement_level: required
-      - ref: zos.smf.id
-        requirement_level: required
-      - ref: mainframe.lpar.name
   - id: service.zos.software
     type: attribute_group
     stability: development
diff --git a/model/zos/entities.yaml b/model/zos/entities.yaml
new file mode 100644
index 000000000..fa6ad2437
--- /dev/null
+++ b/model/zos/entities.yaml
@@ -0,0 +1,12 @@
+groups:
+  - id: entity.zos.software
+    type: entity
+    stability: development
+    name: zos.software
+    brief: A software resource running on a z/OS system.
+    attributes:
+      - ref: zos.sysplex.name
+        requirement_level: required
+      - ref: zos.smf.id
+        requirement_level: required
+      - ref: mainframe.lpar.name