diff --git a/docs/docs/legal/_piid-table.mdx b/docs/docs/legal/_piid-table.mdx
index 4fc3c3618..f06081e0e 100644
--- a/docs/docs/legal/_piid-table.mdx
+++ b/docs/docs/legal/_piid-table.mdx
@@ -76,7 +76,7 @@
     </td>
   </tr>
   <tr>
-    <td><strong>Usage meta data</strong></td>
+    <td><strong>Usage metadata</strong></td>
     <td>
       <ul>
         <li>User agent</li>
diff --git a/docs/src/components/pii_table.jsx b/docs/src/components/pii_table.jsx
index 5075e1d2c..fd3de78fb 100644
--- a/docs/src/components/pii_table.jsx
+++ b/docs/src/components/pii_table.jsx
@@ -69,7 +69,7 @@ export function PiiTable() {
       subjects: "Customers who use our services."
     },
     {
-      type: "Usage meta data",
+      type: "Usage metadata",
       examples: [
         'User agent',
         'IP addresses',
diff --git a/internal/command/org_metadata_test.go b/internal/command/org_metadata_test.go
index ba1954b83..c534b5471 100644
--- a/internal/command/org_metadata_test.go
+++ b/internal/command/org_metadata_test.go
@@ -165,7 +165,7 @@ func TestCommandSide_BulkSetOrgMetadata(t *testing.T) {
 		res    res
 	}{
 		{
-			name: "empty meta data list, pre condition error",
+			name: "empty metadata list, pre condition error",
 			fields: fields{
 				eventstore: expectEventstore(),
 			},
@@ -396,7 +396,7 @@ func TestCommandSide_OrgRemoveMetadata(t *testing.T) {
 			},
 		},
 		{
-			name: "meta data not existing, not found error",
+			name: "metadata not existing, not found error",
 			fields: fields{
 				eventstore: eventstoreExpect(
 					t,
@@ -504,7 +504,7 @@ func TestCommandSide_BulkRemoveOrgMetadata(t *testing.T) {
 		res    res
 	}{
 		{
-			name: "empty meta data list, pre condition error",
+			name: "empty metadata list, pre condition error",
 			fields: fields{
 				eventstore: expectEventstore(),
 			},
diff --git a/internal/command/user_metadata_test.go b/internal/command/user_metadata_test.go
index 88cde4bfb..13091d200 100644
--- a/internal/command/user_metadata_test.go
+++ b/internal/command/user_metadata_test.go
@@ -457,7 +457,7 @@ func TestCommandSide_BulkSetUserMetadata(t *testing.T) {
 		res    res
 	}{
 		{
-			name: "empty meta data list, pre condition error",
+			name: "empty metadata list, pre condition error",
 			fields: fields{
 				eventstore: expectEventstore(),
 			},
@@ -759,7 +759,7 @@ func TestCommandSide_UserRemoveMetadata(t *testing.T) {
 			},
 		},
 		{
-			name: "meta data not existing, not found error",
+			name: "metadata not existing, not found error",
 			fields: fields{
 				eventstore: expectEventstore(
 					expectFilter(
@@ -919,7 +919,7 @@ func TestCommandSide_BulkRemoveUserMetadata(t *testing.T) {
 		res    res
 	}{
 		{
-			name: "empty meta data list, pre condition error",
+			name: "empty metadata list, pre condition error",
 			fields: fields{
 				eventstore: expectEventstore(),
 			},