diff --git a/generator/test_case_generator.go b/generator/test_case_generator.go
index a9d532d20..655d1c8ee 100644
--- a/generator/test_case_generator.go
+++ b/generator/test_case_generator.go
@@ -187,7 +187,7 @@ var testTypeToTestConfig = map[string][]testConfig{
 			targets: map[string]map[string]struct{}{"arc": {"amd64": {}}},
 		},
 		{testDir: "./test/fluent", terraformDir: "terraform/eks/daemon/fluent/bit"},
-		{testDir: "./test/apm", terraformDir: "terraform/eks/daemon/apm",
+		{testDir: "./test/app_signals", terraformDir: "terraform/eks/daemon/app_signals",
 			targets: map[string]map[string]struct{}{"arc": {"amd64": {}}},
 		},
 	},
diff --git a/terraform/eks/daemon/apm/main.tf b/terraform/eks/daemon/app_signals/main.tf
similarity index 99%
rename from terraform/eks/daemon/apm/main.tf
rename to terraform/eks/daemon/app_signals/main.tf
index 5fcbb5800..d2d42a67c 100644
--- a/terraform/eks/daemon/apm/main.tf
+++ b/terraform/eks/daemon/app_signals/main.tf
@@ -325,7 +325,7 @@ resource "kubernetes_daemonset" "service" {
         }
 
         container {
-          name              = "apm-client"
+          name              = "app_signals-client"
           image             = "public.ecr.aws/docker/library/golang:latest"
           image_pull_policy = "Always"
           resources {
diff --git a/terraform/eks/daemon/apm/providers.tf b/terraform/eks/daemon/app_signals/providers.tf
similarity index 100%
rename from terraform/eks/daemon/apm/providers.tf
rename to terraform/eks/daemon/app_signals/providers.tf
diff --git a/terraform/eks/daemon/apm/variables.tf b/terraform/eks/daemon/app_signals/variables.tf
similarity index 94%
rename from terraform/eks/daemon/apm/variables.tf
rename to terraform/eks/daemon/app_signals/variables.tf
index aacb0eaa1..fb73ec3d6 100644
--- a/terraform/eks/daemon/apm/variables.tf
+++ b/terraform/eks/daemon/app_signals/variables.tf
@@ -8,7 +8,7 @@ variable "region" {
 
 variable "test_dir" {
   type    = string
-  default = "./test/apm"
+  default = "./test/app_signals"
 }
 
 variable "cwagent_image_repo" {
diff --git a/test/apm/apm_test.go b/test/app_signals/app_signals_test.go
similarity index 99%
rename from test/apm/apm_test.go
rename to test/app_signals/app_signals_test.go
index d1bbcd442..418156e95 100644
--- a/test/apm/apm_test.go
+++ b/test/app_signals/app_signals_test.go
@@ -3,7 +3,7 @@
 
 //go:build !windows
 
-package apm
+package app_signals
 
 import (
 	"fmt"
diff --git a/test/apm/metrics_test.go b/test/app_signals/metrics_test.go
similarity index 98%
rename from test/apm/metrics_test.go
rename to test/app_signals/metrics_test.go
index 0d239eae3..a6b348b42 100644
--- a/test/apm/metrics_test.go
+++ b/test/app_signals/metrics_test.go
@@ -3,7 +3,7 @@
 
 //go:build !windows
 
-package apm
+package app_signals
 
 import (
 	"time"
diff --git a/test/apm/resources/config.json b/test/app_signals/resources/config.json
similarity index 81%
rename from test/apm/resources/config.json
rename to test/app_signals/resources/config.json
index fbaf609a9..9aa23da0c 100644
--- a/test/apm/resources/config.json
+++ b/test/app_signals/resources/config.json
@@ -4,14 +4,14 @@
   },
   "logs": {
     "metrics_collected": {
-      "apm": {
+      "app_signals": {
         "enabled": true
       }
     }
   },
   "traces": {
     "traces_collected": {
-      "apm": {
+      "app_signals": {
         "enabled": true
       }
     }
diff --git a/test/apm/resources/metrics/client_producer.json b/test/app_signals/resources/metrics/client_producer.json
similarity index 100%
rename from test/apm/resources/metrics/client_producer.json
rename to test/app_signals/resources/metrics/client_producer.json
diff --git a/test/apm/resources/metrics/server_consumer.json b/test/app_signals/resources/metrics/server_consumer.json
similarity index 100%
rename from test/apm/resources/metrics/server_consumer.json
rename to test/app_signals/resources/metrics/server_consumer.json
diff --git a/test/apm/resources/traceid_generator.go b/test/app_signals/resources/traceid_generator.go
similarity index 100%
rename from test/apm/resources/traceid_generator.go
rename to test/app_signals/resources/traceid_generator.go
diff --git a/test/apm/resources/traces/traces.json b/test/app_signals/resources/traces/traces.json
similarity index 95%
rename from test/apm/resources/traces/traces.json
rename to test/app_signals/resources/traces/traces.json
index be2650303..1d6fdf61e 100644
--- a/test/apm/resources/traces/traces.json
+++ b/test/app_signals/resources/traces/traces.json
@@ -32,14 +32,14 @@
       "scopeSpans": [
         {
           "scope": {
-            "name": "apm-integration-test"
+            "name": "app_signals-integration-test"
           },
           "spans": [
             {
               "traceId": "TRACE_ID",
               "spanId": "EEE19B7EC3C1B174",
               "parentSpanId": "EEE19B7EC3C1B173",
-              "name": "apm-integration-test-traces",
+              "name": "app_signals-integration-test-traces",
               "startTimeUnixNano": START_TIME,
               "endTimeUnixNano": START_TIME,
               "kind": 2,
diff --git a/test/apm/traces_test.go b/test/app_signals/traces_test.go
similarity index 99%
rename from test/apm/traces_test.go
rename to test/app_signals/traces_test.go
index d9f059b8d..2b3729c28 100644
--- a/test/apm/traces_test.go
+++ b/test/app_signals/traces_test.go
@@ -3,7 +3,7 @@
 
 //go:build !windows
 
-package apm
+package app_signals
 
 import (
 	"context"