diff --git a/src/snowflake/telemetry/_internal/exporter/otlp/proto/log_exporter/__init__.py b/src/snowflake/telemetry/_internal/exporter/otlp/proto/logs/__init__.py
similarity index 100%
rename from src/snowflake/telemetry/_internal/exporter/otlp/proto/log_exporter/__init__.py
rename to src/snowflake/telemetry/_internal/exporter/otlp/proto/logs/__init__.py
diff --git a/src/snowflake/telemetry/_internal/exporter/otlp/proto/metrics_exporter/__init__.py b/src/snowflake/telemetry/_internal/exporter/otlp/proto/metrics/__init__.py
similarity index 100%
rename from src/snowflake/telemetry/_internal/exporter/otlp/proto/metrics_exporter/__init__.py
rename to src/snowflake/telemetry/_internal/exporter/otlp/proto/metrics/__init__.py
diff --git a/src/snowflake/telemetry/_internal/exporter/otlp/proto/trace_exporter/__init__.py b/src/snowflake/telemetry/_internal/exporter/otlp/proto/traces/__init__.py
similarity index 100%
rename from src/snowflake/telemetry/_internal/exporter/otlp/proto/trace_exporter/__init__.py
rename to src/snowflake/telemetry/_internal/exporter/otlp/proto/traces/__init__.py
diff --git a/tests/test_log_encoder.py b/tests/test_log_encoder.py
index b261f73..bc22591 100644
--- a/tests/test_log_encoder.py
+++ b/tests/test_log_encoder.py
@@ -26,7 +26,7 @@
 from snowflake.telemetry._internal.encoder.otlp.proto.common.log_encoder import (
     _encode_logs,
 )
-from snowflake.telemetry._internal.exporter.otlp.proto.log_exporter import (
+from snowflake.telemetry._internal.exporter.otlp.proto.logs import (
     _ProtoLogExporter,
 )
 from opentelemetry.proto.collector.logs.v1.logs_service_pb2 import (
diff --git a/tests/test_metrics_encoder.py b/tests/test_metrics_encoder.py
index 7a6696c..05b7a3b 100644
--- a/tests/test_metrics_encoder.py
+++ b/tests/test_metrics_encoder.py
@@ -18,7 +18,7 @@
 from snowflake.telemetry._internal.encoder.otlp.proto.common.metrics_encoder import (
     _encode_metrics,
 )
-from snowflake.telemetry._internal.exporter.otlp.proto.metrics_exporter import (
+from snowflake.telemetry._internal.exporter.otlp.proto.metrics import (
     ProtoMetricExporter,
 )
 from opentelemetry.proto.collector.metrics.v1.metrics_service_pb2 import (
diff --git a/tests/test_proto_log_exporter.py b/tests/test_proto_logs_exporter.py
similarity index 98%
rename from tests/test_proto_log_exporter.py
rename to tests/test_proto_logs_exporter.py
index f381c19..8337a12 100644
--- a/tests/test_proto_log_exporter.py
+++ b/tests/test_proto_logs_exporter.py
@@ -13,7 +13,7 @@
     SEVERITY_NUMBER_ERROR,
     SEVERITY_NUMBER_FATAL,
 )
-from snowflake.telemetry._internal.exporter.otlp.proto.log_exporter import (
+from snowflake.telemetry._internal.exporter.otlp.proto.logs import (
     LogWriter,
     SnowflakeLoggingHandler,
 )
diff --git a/tests/test_proto_metric_exporter.py b/tests/test_proto_metric_exporter.py
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/test_proto_span_exporter.py b/tests/test_proto_span_exporter.py
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/test_trace_encoder.py b/tests/test_trace_encoder.py
index 7718a1d..289c419 100644
--- a/tests/test_trace_encoder.py
+++ b/tests/test_trace_encoder.py
@@ -26,7 +26,7 @@
 from snowflake.telemetry._internal.encoder.otlp.proto.common.trace_encoder import (
     _encode_spans,
 )
-from snowflake.telemetry._internal.exporter.otlp.proto.trace_exporter import (
+from snowflake.telemetry._internal.exporter.otlp.proto.traces import (
     ProtoSpanExporter,
 )
 from opentelemetry.proto.collector.trace.v1.trace_service_pb2 import (