diff --git a/.chloggen/2244.yaml b/.chloggen/2244.yaml
new file mode 100644
index 0000000000..7f598ef73b
--- /dev/null
+++ b/.chloggen/2244.yaml
@@ -0,0 +1,22 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: all
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Renames all `resource.*` groups to be `entity.*`"
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [2244]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext: Part of open-telemetry/opentelemetry-specification#4436
diff --git a/docs/general/semantic-convention-groups.md b/docs/general/semantic-convention-groups.md
index caa18875aa..430af6c0b8 100644
--- a/docs/general/semantic-convention-groups.md
+++ b/docs/general/semantic-convention-groups.md
@@ -13,7 +13,7 @@ Each group has a `type` property that could be one of the following:
 - `span` - defines semantic convention for a specific type of span, such as HTTP `CLIENT`
 - `metric` - defines semantic convention for a specific metric, such as HTTP client request duration
 - `event` - defines semantic conventions for a specific event, such as exception.
-- `resource` - defines semantic conventions for a specific entity the telemetry is collected within,
+- `entity` - defines semantic conventions for a specific entity the telemetry is collected within,
   such as `service`.
 
 Groups that have `attribute_group` type do not describe semantic convention and
diff --git a/docs/resource/README.md b/docs/resource/README.md
index 055d57b085..150372fadf 100644
--- a/docs/resource/README.md
+++ b/docs/resource/README.md
@@ -67,7 +67,7 @@ as specified in the [Resource SDK specification](https://github.com/open-telemet
 
 ## Service
 
-<!-- semconv resource.service -->
+<!-- semconv entity.service -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -140,7 +140,7 @@ service.name = Shop.shoppingcart
 
 ## Telemetry SDK
 
-<!-- semconv resource.telemetry.sdk -->
+<!-- semconv entity.telemetry.sdk -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -193,7 +193,7 @@ All custom identifiers SHOULD be stable across different versions of an implemen
 
 ## Telemetry distro
 
-<!-- semconv resource.telemetry.distro -->
+<!-- semconv entity.telemetry.distro -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/docs/resource/android.md b/docs/resource/android.md
index 48934cc46a..49200c563f 100644
--- a/docs/resource/android.md
+++ b/docs/resource/android.md
@@ -1,6 +1,6 @@
 # Android
 
-<!-- semconv resource.android -->
+<!-- semconv entity.android -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/docs/resource/browser.md b/docs/resource/browser.md
index 0d9a559249..1bbb1688f5 100644
--- a/docs/resource/browser.md
+++ b/docs/resource/browser.md
@@ -1,6 +1,6 @@
 # Browser
 
-<!-- semconv resource.browser -->
+<!-- semconv entity.browser -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/docs/resource/cicd.md b/docs/resource/cicd.md
index 779b2511ab..f2ce6f2d6b 100644
--- a/docs/resource/cicd.md
+++ b/docs/resource/cicd.md
@@ -24,7 +24,7 @@ See also:
 
 ### CICD pipeline
 
-<!-- semconv resource.cicd.pipeline -->
+<!-- semconv entity.cicd.pipeline -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -55,7 +55,7 @@ Since this resource is unique for each pipeline run, this means instantiating se
 
 Using the CICD pipeline run resource with metrics inherently causes high cardinality and may increase costs with some metric storage backends. Thus, using CICD pipeline run resource for metrics MUST be opt-in.
 
-<!-- semconv resource.cicd.pipeline.run -->
+<!-- semconv entity.cicd.pipeline.run -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -81,7 +81,7 @@ Using the CICD pipeline run resource with metrics inherently causes high cardina
 
 ### CICD worker
 
-<!-- semconv resource.cicd.worker -->
+<!-- semconv entity.cicd.worker -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -110,7 +110,7 @@ Using the CICD pipeline run resource with metrics inherently causes high cardina
 
 ### VCS repository
 
-<!-- semconv resource.vcs.repo -->
+<!-- semconv entity.vcs.repo -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -143,7 +143,7 @@ the `.git` extension.
 
 ### VCS reference
 
-<!-- semconv resource.vcs.ref -->
+<!-- semconv entity.vcs.ref -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/docs/resource/cloud-provider/aws/ecs.md b/docs/resource/cloud-provider/aws/ecs.md
index 9b71995336..a5c61c6806 100644
--- a/docs/resource/cloud-provider/aws/ecs.md
+++ b/docs/resource/cloud-provider/aws/ecs.md
@@ -4,7 +4,7 @@ linkTitle: ECS
 
 # AWS ECS
 
-<!-- semconv resource.aws.ecs -->
+<!-- semconv entity.aws.ecs -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/docs/resource/cloud-provider/aws/eks.md b/docs/resource/cloud-provider/aws/eks.md
index b2dbbfcbdb..973c3a49e1 100644
--- a/docs/resource/cloud-provider/aws/eks.md
+++ b/docs/resource/cloud-provider/aws/eks.md
@@ -4,7 +4,7 @@ linkTitle: EKS
 
 # AWS EKS
 
-<!-- semconv resource.aws.eks -->
+<!-- semconv entity.aws.eks -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/docs/resource/cloud-provider/aws/logs.md b/docs/resource/cloud-provider/aws/logs.md
index 1f3823f8df..2f6ec85863 100644
--- a/docs/resource/cloud-provider/aws/logs.md
+++ b/docs/resource/cloud-provider/aws/logs.md
@@ -4,7 +4,7 @@ linkTitle: Logs
 
 # AWS logs
 
-<!-- semconv resource.aws.log -->
+<!-- semconv entity.aws.log -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/docs/resource/cloud-provider/gcp/apphub.md b/docs/resource/cloud-provider/gcp/apphub.md
index 414b12e023..beead19398 100644
--- a/docs/resource/cloud-provider/gcp/apphub.md
+++ b/docs/resource/cloud-provider/gcp/apphub.md
@@ -12,7 +12,7 @@ See [Supported Resources](https://cloud.google.com/app-hub/docs/supported-resour
 
 ## Application
 
-<!-- semconv resource.gcp.apphub.application -->
+<!-- semconv entity.gcp.apphub.application -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -39,7 +39,7 @@ See [Supported Resources](https://cloud.google.com/app-hub/docs/supported-resour
 
 ## Service
 
-<!-- semconv resource.gcp.apphub.service -->
+<!-- semconv entity.gcp.apphub.service -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -92,7 +92,7 @@ See [Supported Resources](https://cloud.google.com/app-hub/docs/supported-resour
 
 ## Workload
 
-<!-- semconv resource.gcp.apphub.workload -->
+<!-- semconv entity.gcp.apphub.workload -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/docs/resource/cloud-provider/gcp/cloud-run.md b/docs/resource/cloud-provider/gcp/cloud-run.md
index 98269e52d0..a2f48b4e03 100644
--- a/docs/resource/cloud-provider/gcp/cloud-run.md
+++ b/docs/resource/cloud-provider/gcp/cloud-run.md
@@ -4,7 +4,7 @@
 
 These conventions are recommended for resources running on Cloud Run.
 
-<!-- semconv resource.gcp.cloud_run -->
+<!-- semconv entity.gcp.cloud_run -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/docs/resource/cloud-provider/gcp/gce.md b/docs/resource/cloud-provider/gcp/gce.md
index 3735935ec6..a655f20ca9 100644
--- a/docs/resource/cloud-provider/gcp/gce.md
+++ b/docs/resource/cloud-provider/gcp/gce.md
@@ -1,6 +1,6 @@
 # Google Compute Engine
 
-<!-- semconv resource.gcp.gce -->
+<!-- semconv entity.gcp.gce -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/docs/resource/cloud-provider/heroku.md b/docs/resource/cloud-provider/heroku.md
index a8963283ef..711d2ea9f0 100644
--- a/docs/resource/cloud-provider/heroku.md
+++ b/docs/resource/cloud-provider/heroku.md
@@ -1,6 +1,6 @@
 # Heroku
 
-<!-- semconv resource.heroku -->
+<!-- semconv entity.heroku -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/docs/resource/cloud.md b/docs/resource/cloud.md
index 9df34c8323..4505315212 100644
--- a/docs/resource/cloud.md
+++ b/docs/resource/cloud.md
@@ -1,6 +1,6 @@
 # Cloud
 
-<!-- semconv resource.cloud -->
+<!-- semconv entity.cloud -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/docs/resource/cloudfoundry.md b/docs/resource/cloudfoundry.md
index 2f8b6f0dd6..77535d96f6 100644
--- a/docs/resource/cloudfoundry.md
+++ b/docs/resource/cloudfoundry.md
@@ -22,7 +22,7 @@ They align with the Bosh deployment tool of CloudFoundry.
 
 ## Organization
 
-<!-- semconv resource.cloudfoundry.org -->
+<!-- semconv entity.cloudfoundry.org -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -56,7 +56,7 @@ reported by `cf orgs`.
 
 ## Space
 
-<!-- semconv resource.cloudfoundry.space -->
+<!-- semconv entity.cloudfoundry.space -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -90,7 +90,7 @@ reported by `cf spaces`.
 
 ## Application
 
-<!-- semconv resource.cloudfoundry.app -->
+<!-- semconv entity.cloudfoundry.app -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -124,7 +124,7 @@ as reported by `cf apps`.
 
 ## Process
 
-<!-- semconv resource.cloudfoundry.process -->
+<!-- semconv entity.cloudfoundry.process -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -159,7 +159,7 @@ tasks or side-cars with different process types.
 
 ## Cloud Foundry System component
 
-<!-- semconv resource.cloudfoundry.system -->
+<!-- semconv entity.cloudfoundry.system -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/docs/resource/container.md b/docs/resource/container.md
index 2b39efa6fb..8473e4c593 100644
--- a/docs/resource/container.md
+++ b/docs/resource/container.md
@@ -1,6 +1,6 @@
 # Container
 
-<!-- semconv resource.container -->
+<!-- semconv entity.container -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/docs/resource/deployment-environment.md b/docs/resource/deployment-environment.md
index eba5329ef8..af337d48f1 100644
--- a/docs/resource/deployment-environment.md
+++ b/docs/resource/deployment-environment.md
@@ -1,6 +1,6 @@
 # Deployment
 
-<!-- semconv resource.deployment -->
+<!-- semconv entity.deployment -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/docs/resource/device.md b/docs/resource/device.md
index 1c9f0453d7..737e75b75b 100644
--- a/docs/resource/device.md
+++ b/docs/resource/device.md
@@ -1,6 +1,6 @@
 # Device
 
-<!-- semconv resource.device -->
+<!-- semconv entity.device -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/docs/resource/faas.md b/docs/resource/faas.md
index f0713acf95..13891a5492 100644
--- a/docs/resource/faas.md
+++ b/docs/resource/faas.md
@@ -11,7 +11,7 @@ See also:
 
 ## FaaS resource attributes
 
-<!-- semconv resource.faas -->
+<!-- semconv entity.faas -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/docs/resource/host.md b/docs/resource/host.md
index 666104ef88..97057c8131 100644
--- a/docs/resource/host.md
+++ b/docs/resource/host.md
@@ -3,7 +3,7 @@
 The `host.*` namespace SHOULD be exclusively used to capture resource attributes.
 To report host metrics, the `system.*` namespace SHOULD be used.
 
-<!-- semconv resource.host -->
+<!-- semconv entity.host -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -81,7 +81,7 @@ privileged lookup of `host.id` is required, the value should be injected via the
 
 **type:** `host.cpu`
 
-<!-- semconv resource.host.cpu -->
+<!-- semconv entity.host.cpu -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/docs/resource/k8s.md b/docs/resource/k8s.md
index f100031cbc..a5f9ac5886 100644
--- a/docs/resource/k8s.md
+++ b/docs/resource/k8s.md
@@ -17,7 +17,7 @@ Kubernetes object, but "name" is usually more user friendly so can be also set.
 
 ## Cluster
 
-<!-- semconv resource.k8s.cluster -->
+<!-- semconv entity.k8s.cluster -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -66,7 +66,7 @@ conflict.
 
 ## Node
 
-<!-- semconv resource.k8s.node -->
+<!-- semconv entity.k8s.node -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -111,7 +111,7 @@ conflict.
 Namespaces provide a scope for names. Names of objects need to be unique within
 a namespace, but not across namespaces.
 
-<!-- semconv resource.k8s.namespace -->
+<!-- semconv entity.k8s.namespace -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -145,7 +145,7 @@ a namespace, but not across namespaces.
 The smallest and simplest Kubernetes object. A Pod represents a set of running
 containers on your cluster.
 
-<!-- semconv resource.k8s.pod -->
+<!-- semconv entity.k8s.pod -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -198,7 +198,7 @@ from the name of the running container.
 Note: This type is different from [container](./container.md), which corresponds
 to a running container.
 
-<!-- semconv resource.k8s.container -->
+<!-- semconv entity.k8s.container -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -225,7 +225,7 @@ to a running container.
 
 ## ReplicaSet
 
-<!-- semconv resource.k8s.replicaset -->
+<!-- semconv entity.k8s.replicaset -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -261,7 +261,7 @@ An API object that manages a replicated application, typically by running Pods
 with no local state. Each replica is represented by a Pod, and the Pods are
 distributed among the nodes of a cluster.
 
-<!-- semconv resource.k8s.deployment -->
+<!-- semconv entity.k8s.deployment -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -296,7 +296,7 @@ distributed among the nodes of a cluster.
 Manages the deployment and scaling of a set of Pods, and provides guarantees
 about the ordering and uniqueness of these Pods.
 
-<!-- semconv resource.k8s.statefulset -->
+<!-- semconv entity.k8s.statefulset -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -330,7 +330,7 @@ about the ordering and uniqueness of these Pods.
 
 A DaemonSet ensures that all (or some) Nodes run a copy of a Pod.
 
-<!-- semconv resource.k8s.daemonset -->
+<!-- semconv entity.k8s.daemonset -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -365,7 +365,7 @@ A DaemonSet ensures that all (or some) Nodes run a copy of a Pod.
 A Job creates one or more Pods and ensures that a specified number of them
 successfully terminate.
 
-<!-- semconv resource.k8s.job -->
+<!-- semconv entity.k8s.job -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -399,7 +399,7 @@ successfully terminate.
 
 A CronJob creates Jobs on a repeating schedule.
 
-<!-- semconv resource.k8s.cronjob -->
+<!-- semconv entity.k8s.cronjob -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -443,7 +443,7 @@ A CronJob creates Jobs on a repeating schedule.
 
 A ReplicationController ensures that a specified number of pod replicas are running at any one time.
 
-<!-- semconv resource.k8s.replicationcontroller -->
+<!-- semconv entity.k8s.replicationcontroller -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -472,7 +472,7 @@ A ReplicationController ensures that a specified number of pod replicas are runn
 A HorizontalPodAutoscaler (HPA for short) automatically updates a workload resource
 (such as a Deployment or StatefulSet), with the aim of automatically scaling the workload to match demand.
 
-<!-- semconv resource.k8s.hpa -->
+<!-- semconv entity.k8s.hpa -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -500,7 +500,7 @@ A HorizontalPodAutoscaler (HPA for short) automatically updates a workload resou
 
 A ResourceQuota provides constraints that limit aggregate resource consumption per namespace.
 
-<!-- semconv resource.k8s.resourcequota -->
+<!-- semconv entity.k8s.resourcequota -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/docs/resource/os.md b/docs/resource/os.md
index 8c00a0dc73..809a64860f 100644
--- a/docs/resource/os.md
+++ b/docs/resource/os.md
@@ -2,7 +2,7 @@
 
 In case of virtualized environments, this is the operating system as it is observed by the process, i.e., the virtualized guest rather than the underlying host.
 
-<!-- semconv resource.os -->
+<!-- semconv entity.os -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/docs/resource/process.md b/docs/resource/process.md
index 0fc40f1cff..61a973f88f 100644
--- a/docs/resource/process.md
+++ b/docs/resource/process.md
@@ -23,7 +23,7 @@ linkTitle: Process
 
 ## Process
 
-<!-- semconv resource.process -->
+<!-- semconv entity.process -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -82,7 +82,7 @@ On Windows and other systems where the native format of process commands is a si
 
 ## Process runtimes
 
-<!-- semconv resource.process.runtime -->
+<!-- semconv entity.process.runtime -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/docs/resource/webengine.md b/docs/resource/webengine.md
index e431f1c48d..d199232ad9 100644
--- a/docs/resource/webengine.md
+++ b/docs/resource/webengine.md
@@ -1,6 +1,6 @@
 # Webengine
 
-<!-- semconv resource.webengine -->
+<!-- semconv entity.webengine -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/model/android/resources.yaml b/model/android/entities.yaml
similarity index 89%
rename from model/android/resources.yaml
rename to model/android/entities.yaml
index a3fb5dd988..24de11dcb1 100644
--- a/model/android/resources.yaml
+++ b/model/android/entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.android
+  - id: entity.android
     type: entity
     stability: development
     name: android
diff --git a/model/app/resources.yaml b/model/app/entities.yaml
similarity index 90%
rename from model/app/resources.yaml
rename to model/app/entities.yaml
index 8107e463cf..53b029ff42 100644
--- a/model/app/resources.yaml
+++ b/model/app/entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.app
+  - id: entity.app
     type: entity
     stability: development
     name: app
diff --git a/model/aws/ecs-resources.yaml b/model/aws/ecs-entities.yaml
similarity index 97%
rename from model/aws/ecs-resources.yaml
rename to model/aws/ecs-entities.yaml
index c9cf73f175..20570cbdb4 100644
--- a/model/aws/ecs-resources.yaml
+++ b/model/aws/ecs-entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.aws.ecs
+  - id: entity.aws.ecs
     type: entity
     stability: development
     name: aws.ecs
diff --git a/model/aws/eks-resources.yaml b/model/aws/eks-entities.yaml
similarity index 90%
rename from model/aws/eks-resources.yaml
rename to model/aws/eks-entities.yaml
index ad14883714..a3377a8ec8 100644
--- a/model/aws/eks-resources.yaml
+++ b/model/aws/eks-entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.aws.eks
+  - id: entity.aws.eks
     type: entity
     stability: development
     name: aws.eks
diff --git a/model/aws/logs-resources.yaml b/model/aws/logs-entities.yaml
similarity index 94%
rename from model/aws/logs-resources.yaml
rename to model/aws/logs-entities.yaml
index d4b3962ebf..a385c09d97 100644
--- a/model/aws/logs-resources.yaml
+++ b/model/aws/logs-entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.aws.log
+  - id: entity.aws.log
     type: entity
     stability: development
     name: aws.log
diff --git a/model/browser/resources.yaml b/model/browser/entities.yaml
similarity index 97%
rename from model/browser/resources.yaml
rename to model/browser/entities.yaml
index 83a1392e5c..de8e248eb4 100644
--- a/model/browser/resources.yaml
+++ b/model/browser/entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.browser
+  - id: entity.browser
     type: entity
     stability: development
     name: browser
diff --git a/model/cicd/resources.yaml b/model/cicd/entities.yaml
similarity index 90%
rename from model/cicd/resources.yaml
rename to model/cicd/entities.yaml
index a285b2ab5a..64d13fcb88 100644
--- a/model/cicd/resources.yaml
+++ b/model/cicd/entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.cicd.pipeline
+  - id: entity.cicd.pipeline
     type: entity
     stability: development
     name: cicd.pipeline
@@ -8,7 +8,7 @@ groups:
     attributes:
       - ref: cicd.pipeline.name
 
-  - id: resource.cicd.pipeline.run
+  - id: entity.cicd.pipeline.run
     type: entity
     stability: development
     name: cicd.pipeline.run
@@ -18,7 +18,7 @@ groups:
       - ref: cicd.pipeline.run.id
       - ref: cicd.pipeline.run.url.full
 
-  - id: resource.cicd.worker
+  - id: entity.cicd.worker
     type: entity
     stability: development
     name: cicd.worker
diff --git a/model/cloud/resources.yaml b/model/cloud/entities.yaml
similarity index 93%
rename from model/cloud/resources.yaml
rename to model/cloud/entities.yaml
index e318b98a14..4328846eb7 100644
--- a/model/cloud/resources.yaml
+++ b/model/cloud/entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.cloud
+  - id: entity.cloud
     type: entity
     stability: development
     name: cloud
diff --git a/model/cloudfoundry/resources.yaml b/model/cloudfoundry/entities.yaml
similarity index 86%
rename from model/cloudfoundry/resources.yaml
rename to model/cloudfoundry/entities.yaml
index 0dffd3d934..68756d7e98 100644
--- a/model/cloudfoundry/resources.yaml
+++ b/model/cloudfoundry/entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.cloudfoundry.system
+  - id: entity.cloudfoundry.system
     type: entity
     stability: development
     name: cloudfoundry.system
@@ -8,7 +8,7 @@ groups:
     attributes:
       - ref: cloudfoundry.system.id
       - ref: cloudfoundry.system.instance.id
-  - id: resource.cloudfoundry.app
+  - id: entity.cloudfoundry.app
     type: entity
     stability: development
     name: cloudfoundry.app
@@ -17,7 +17,7 @@ groups:
     attributes:
       - ref: cloudfoundry.app.id
       - ref: cloudfoundry.app.name
-  - id: resource.cloudfoundry.space
+  - id: entity.cloudfoundry.space
     type: entity
     stability: development
     name: cloudfoundry.space
@@ -26,7 +26,7 @@ groups:
     attributes:
       - ref: cloudfoundry.space.id
       - ref: cloudfoundry.space.name
-  - id: resource.cloudfoundry.org
+  - id: entity.cloudfoundry.org
     type: entity
     stability: development
     name: cloudfoundry.org
@@ -35,7 +35,7 @@ groups:
     attributes:
       - ref: cloudfoundry.org.id
       - ref: cloudfoundry.org.name
-  - id: resource.cloudfoundry.process
+  - id: entity.cloudfoundry.process
     type: entity
     stability: development
     name: cloudfoundry.process
diff --git a/model/container/resources.yaml b/model/container/entities.yaml
similarity index 95%
rename from model/container/resources.yaml
rename to model/container/entities.yaml
index 2630124a28..23b1249773 100644
--- a/model/container/resources.yaml
+++ b/model/container/entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.container
+  - id: entity.container
     type: entity
     stability: development
     name: container
diff --git a/model/deployment/resources.yaml b/model/deployment/entities.yaml
similarity index 88%
rename from model/deployment/resources.yaml
rename to model/deployment/entities.yaml
index 83aada1925..caa820451d 100644
--- a/model/deployment/resources.yaml
+++ b/model/deployment/entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.deployment
+  - id: entity.deployment
     type: entity
     stability: development
     name: deployment
diff --git a/model/device/resources.yaml b/model/device/entities.yaml
similarity index 93%
rename from model/device/resources.yaml
rename to model/device/entities.yaml
index fd8f5837c6..4a3ba40190 100644
--- a/model/device/resources.yaml
+++ b/model/device/entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.device
+  - id: entity.device
     type: entity
     stability: development
     name: device
diff --git a/model/faas/resources.yaml b/model/faas/entities.yaml
similarity index 93%
rename from model/faas/resources.yaml
rename to model/faas/entities.yaml
index fa430c4779..a190f77ca8 100644
--- a/model/faas/resources.yaml
+++ b/model/faas/entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.faas
+  - id: entity.faas
     type: entity
     stability: development
     name: faas
diff --git a/model/gcp/apphub.yaml b/model/gcp/apphub.yaml
index 2ffddd04aa..cf75e972ed 100644
--- a/model/gcp/apphub.yaml
+++ b/model/gcp/apphub.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.gcp.apphub.application
+  - id: entity.gcp.apphub.application
     type: entity
     stability: development
     name: gcp.apphub.application
@@ -13,7 +13,7 @@ groups:
         requirement_level: required
       - ref: gcp.apphub.application.id
         requirement_level: required
-  - id: resource.gcp.apphub.service
+  - id: entity.gcp.apphub.service
     type: entity
     stability: development
     name: gcp.apphub.service
@@ -27,7 +27,7 @@ groups:
         requirement_level: required
       - ref: gcp.apphub.service.criticality_type
         requirement_level: required
-  - id: resource.gcp.apphub.workload
+  - id: entity.gcp.apphub.workload
     type: entity
     stability: development
     name: gcp.apphub.workload
diff --git a/model/gcp/cloud-run-resources.yaml b/model/gcp/cloud-run-entities.yaml
similarity index 90%
rename from model/gcp/cloud-run-resources.yaml
rename to model/gcp/cloud-run-entities.yaml
index 8c1e2da13e..ee212898b8 100644
--- a/model/gcp/cloud-run-resources.yaml
+++ b/model/gcp/cloud-run-entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.gcp.cloud_run
+  - id: entity.gcp.cloud_run
     type: entity
     stability: development
     name: gcp.cloud_run
diff --git a/model/gcp/gce-resources.yaml b/model/gcp/gce-entities.yaml
similarity index 92%
rename from model/gcp/gce-resources.yaml
rename to model/gcp/gce-entities.yaml
index 2e2c8195b3..1c6f0a843f 100644
--- a/model/gcp/gce-resources.yaml
+++ b/model/gcp/gce-entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.gcp.gce
+  - id: entity.gcp.gce
     type: entity
     stability: development
     name: gcp.gce
diff --git a/model/heroku/resources.yaml b/model/heroku/entities.yaml
similarity index 94%
rename from model/heroku/resources.yaml
rename to model/heroku/entities.yaml
index 3f17cf478f..6f7d308cc9 100644
--- a/model/heroku/resources.yaml
+++ b/model/heroku/entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.heroku
+  - id: entity.heroku
     type: entity
     stability: development
     name: heroku
diff --git a/model/host/resources.yaml b/model/host/entities.yaml
similarity index 98%
rename from model/host/resources.yaml
rename to model/host/entities.yaml
index 4bd87fcd89..a4edb28c85 100644
--- a/model/host/resources.yaml
+++ b/model/host/entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.host
+  - id: entity.host
     type: entity
     stability: development
     name: host
@@ -44,7 +44,7 @@ groups:
       - ref: host.mac
         requirement_level: opt_in
 
-  - id: resource.host.cpu
+  - id: entity.host.cpu
     type: entity
     stability: development
     name: host.cpu
diff --git a/model/k8s/resources.yaml b/model/k8s/entities.yaml
similarity index 90%
rename from model/k8s/resources.yaml
rename to model/k8s/entities.yaml
index 50f755e09d..de3cefcc24 100644
--- a/model/k8s/resources.yaml
+++ b/model/k8s/entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.k8s.cluster
+  - id: entity.k8s.cluster
     type: entity
     stability: development
     name: k8s.cluster
@@ -9,7 +9,7 @@ groups:
       - ref: k8s.cluster.name
       - ref: k8s.cluster.uid
 
-  - id: resource.k8s.node
+  - id: entity.k8s.node
     type: entity
     stability: development
     name: k8s.node
@@ -23,7 +23,7 @@ groups:
       - ref: k8s.node.annotation
         requirement_level: opt_in
 
-  - id: resource.k8s.namespace
+  - id: entity.k8s.namespace
     type: entity
     stability: development
     name: k8s.namespace
@@ -36,7 +36,7 @@ groups:
       - ref: k8s.namespace.annotation
         requirement_level: opt_in
 
-  - id: resource.k8s.pod
+  - id: entity.k8s.pod
     type: entity
     stability: development
     name: k8s.pod
@@ -50,7 +50,7 @@ groups:
       - ref: k8s.pod.annotation
         requirement_level: opt_in
 
-  - id: resource.k8s.container
+  - id: entity.k8s.container
     type: entity
     stability: development
     name: k8s.container
@@ -61,7 +61,7 @@ groups:
       - ref: k8s.container.restart_count
       - ref: k8s.container.status.last_terminated_reason
 
-  - id: resource.k8s.replicaset
+  - id: entity.k8s.replicaset
     type: entity
     stability: development
     name: k8s.replicaset
@@ -75,7 +75,7 @@ groups:
       - ref: k8s.replicaset.annotation
         requirement_level: opt_in
 
-  - id: resource.k8s.deployment
+  - id: entity.k8s.deployment
     type: entity
     stability: development
     name: k8s.deployment
@@ -89,7 +89,7 @@ groups:
       - ref: k8s.deployment.annotation
         requirement_level: opt_in
 
-  - id: resource.k8s.statefulset
+  - id: entity.k8s.statefulset
     type: entity
     stability: development
     name: k8s.statefulset
@@ -103,7 +103,7 @@ groups:
       - ref: k8s.statefulset.annotation
         requirement_level: opt_in
 
-  - id: resource.k8s.daemonset
+  - id: entity.k8s.daemonset
     type: entity
     stability: development
     name: k8s.daemonset
@@ -117,7 +117,7 @@ groups:
       - ref: k8s.daemonset.annotation
         requirement_level: opt_in
 
-  - id: resource.k8s.job
+  - id: entity.k8s.job
     type: entity
     stability: development
     name: k8s.job
@@ -131,7 +131,7 @@ groups:
       - ref: k8s.job.annotation
         requirement_level: opt_in
 
-  - id: resource.k8s.cronjob
+  - id: entity.k8s.cronjob
     type: entity
     stability: development
     name: k8s.cronjob
@@ -145,7 +145,7 @@ groups:
       - ref: k8s.cronjob.annotation
         requirement_level: opt_in
 
-  - id: resource.k8s.replicationcontroller
+  - id: entity.k8s.replicationcontroller
     type: entity
     stability: development
     name: k8s.replicationcontroller
@@ -155,7 +155,7 @@ groups:
       - ref: k8s.replicationcontroller.uid
       - ref: k8s.replicationcontroller.name
 
-  - id: resource.k8s.hpa
+  - id: entity.k8s.hpa
     type: entity
     stability: development
     name: k8s.hpa
@@ -165,7 +165,7 @@ groups:
       - ref: k8s.hpa.uid
       - ref: k8s.hpa.name
 
-  - id: resource.k8s.resourcequota
+  - id: entity.k8s.resourcequota
     type: entity
     stability: development
     name: k8s.resourcequota
diff --git a/model/os/resources.yaml b/model/os/entities.yaml
similarity index 98%
rename from model/os/resources.yaml
rename to model/os/entities.yaml
index fe9c9e3472..f6b8a5c782 100644
--- a/model/os/resources.yaml
+++ b/model/os/entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.os
+  - id: entity.os
     type: entity
     stability: development
     name: os
diff --git a/model/otel/resources.yaml b/model/otel/entities.yaml
similarity index 93%
rename from model/otel/resources.yaml
rename to model/otel/entities.yaml
index 3110501678..c1a9f97af1 100644
--- a/model/otel/resources.yaml
+++ b/model/otel/entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.otel.scope
+  - id: entity.otel.scope
     # This should not be a resource, but an attribute group.
     type: entity
     stability: development
diff --git a/model/process/resources.yaml b/model/process/entities.yaml
similarity index 96%
rename from model/process/resources.yaml
rename to model/process/entities.yaml
index 55529613b1..10c557fc10 100644
--- a/model/process/resources.yaml
+++ b/model/process/entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.process
+  - id: entity.process
     type: entity
     stability: development
     name: process
@@ -26,7 +26,7 @@ groups:
       - ref: process.owner
       - ref: process.linux.cgroup
 
-  - id: resource.process.runtime
+  - id: entity.process.runtime
     type: entity
     stability: development
     name: process.runtime
diff --git a/model/service/resources.yaml b/model/service/entities.yaml
similarity index 91%
rename from model/service/resources.yaml
rename to model/service/entities.yaml
index 391a22c980..5627ac5193 100644
--- a/model/service/resources.yaml
+++ b/model/service/entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.service
+  - id: entity.service
     type: entity
     name: service
     brief: >
diff --git a/model/telemetry/resources.yaml b/model/telemetry/entities.yaml
similarity index 92%
rename from model/telemetry/resources.yaml
rename to model/telemetry/entities.yaml
index 9a7aaa8d2e..15ce890c95 100644
--- a/model/telemetry/resources.yaml
+++ b/model/telemetry/entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.telemetry.sdk
+  - id: entity.telemetry.sdk
     name: telemetry.sdk
     type: entity
     stability: stable
@@ -12,7 +12,7 @@ groups:
         requirement_level: required
       - ref: telemetry.sdk.version
         requirement_level: required
-  - id: resource.telemetry.distro
+  - id: entity.telemetry.distro
     name: 'telemetry.distro'
     type: entity
     stability: development
diff --git a/model/vcs/resources.yaml b/model/vcs/entities.yaml
similarity index 90%
rename from model/vcs/resources.yaml
rename to model/vcs/entities.yaml
index 7c38ba1347..b6317aefc4 100644
--- a/model/vcs/resources.yaml
+++ b/model/vcs/entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.vcs.repo
+  - id: entity.vcs.repo
     type: entity
     stability: development
     name: vcs.repo
@@ -9,7 +9,7 @@ groups:
       - ref: vcs.repository.url.full
       - ref: vcs.repository.name
 
-  - id: resource.vcs.ref
+  - id: entity.vcs.ref
     type: entity
     stability: development
     name: vcs.ref
diff --git a/model/webengine/resources.yaml b/model/webengine/entities.yaml
similarity index 94%
rename from model/webengine/resources.yaml
rename to model/webengine/entities.yaml
index 3744483517..836a3aef55 100644
--- a/model/webengine/resources.yaml
+++ b/model/webengine/entities.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: resource.webengine
+  - id: entity.webengine
     type: entity
     stability: development
     name: webengine
diff --git a/policies/group_stability.rego b/policies/group_stability.rego
index 62eb061bb9..44abfcbb63 100644
--- a/policies/group_stability.rego
+++ b/policies/group_stability.rego
@@ -11,7 +11,7 @@ deny contains group_stability_violation(description, group.id, name) if {
         # TODO: https://github.com/open-telemetry/semantic-conventions/issues/1514
         "metric.kestrel.connection.duration", "metric.kestrel.tls_handshake.duration",
         # TODO: https://github.com/open-telemetry/semantic-conventions/issues/1519
-        "resource.service",
+        "entity.service",
         # TODO: https://github.com/open-telemetry/semantic-conventions/issues/1616
         "metric.dotnet.process.cpu.time",
     }