diff --git a/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/src/main/java/io/sentry/opentelemetry/SentryAutoConfigurationCustomizerProvider.java b/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/src/main/java/io/sentry/opentelemetry/SentryAutoConfigurationCustomizerProvider.java
index 66b55a4f0be..019541e7e3a 100644
--- a/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/src/main/java/io/sentry/opentelemetry/SentryAutoConfigurationCustomizerProvider.java
+++ b/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/src/main/java/io/sentry/opentelemetry/SentryAutoConfigurationCustomizerProvider.java
@@ -161,7 +161,7 @@ private SdkTracerProviderBuilder configureSdkTracerProvider(
       SdkTracerProviderBuilder tracerProvider, ConfigProperties config) {
     return tracerProvider
         .setSampler(new SentrySampler())
-        .addSpanProcessor(new PotelSentrySpanProcessor())
+        .addSpanProcessor(new OtelSentrySpanProcessor())
         .addSpanProcessor(BatchSpanProcessor.builder(new SentrySpanExporter()).build());
   }
 
diff --git a/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/src/main/java/io/sentry/opentelemetry/SentryPropagatorProvider.java b/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/src/main/java/io/sentry/opentelemetry/SentryPropagatorProvider.java
index ac507badb47..6aa04f31e9f 100644
--- a/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/src/main/java/io/sentry/opentelemetry/SentryPropagatorProvider.java
+++ b/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/src/main/java/io/sentry/opentelemetry/SentryPropagatorProvider.java
@@ -7,8 +7,7 @@
 public final class SentryPropagatorProvider implements ConfigurablePropagatorProvider {
   @Override
   public TextMapPropagator getPropagator(ConfigProperties config) {
-    //    return new SentryPropagator();
-    return new PotelSentryPropagator();
+    return new OtelSentryPropagator();
   }
 
   @Override
diff --git a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/InternalSemanticAttributes.java b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/InternalSemanticAttributes.java
index d186d2c634e..cb64d7bfffd 100644
--- a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/InternalSemanticAttributes.java
+++ b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/InternalSemanticAttributes.java
@@ -1,7 +1,9 @@
 package io.sentry.opentelemetry;
 
 import io.opentelemetry.api.common.AttributeKey;
+import org.jetbrains.annotations.ApiStatus;
 
+@ApiStatus.Internal
 public final class InternalSemanticAttributes {
   public static final AttributeKey<Boolean> SAMPLED = AttributeKey.booleanKey("sentry.sampled");
   public static final AttributeKey<Double> SAMPLE_RATE =
diff --git a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/OtelContextScopesStorage.java b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/OtelContextScopesStorage.java
index 299e91dae90..810c6c08cca 100644
--- a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/OtelContextScopesStorage.java
+++ b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/OtelContextScopesStorage.java
@@ -7,9 +7,11 @@
 import io.sentry.IScopes;
 import io.sentry.IScopesStorage;
 import io.sentry.ISentryLifecycleToken;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@ApiStatus.Internal
 @SuppressWarnings("MustBeClosedChecker")
 public final class OtelContextScopesStorage implements IScopesStorage {
 
diff --git a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/OtelSpanContext.java b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/OtelSpanContext.java
index 5f75a6f10e4..7b279802c94 100644
--- a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/OtelSpanContext.java
+++ b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/OtelSpanContext.java
@@ -11,9 +11,11 @@
 import io.sentry.TracesSamplingDecision;
 import io.sentry.protocol.SentryId;
 import java.lang.ref.WeakReference;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@ApiStatus.Internal
 public final class OtelSpanContext extends SpanContext {
 
   /**
diff --git a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/SentryContextStorage.java b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/SentryContextStorage.java
index 34b71b5426a..6ce6f888169 100644
--- a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/SentryContextStorage.java
+++ b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/SentryContextStorage.java
@@ -5,8 +5,10 @@
 import io.opentelemetry.context.Scope;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
+@ApiStatus.Internal
 public final class SentryContextStorage implements ContextStorage {
   private final @NotNull Logger logger = Logger.getLogger(SentryContextStorage.class.getName());
 
diff --git a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/SentryContextWrapper.java b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/SentryContextWrapper.java
index cf5a6495f08..e2a5efaf89c 100644
--- a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/SentryContextWrapper.java
+++ b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/SentryContextWrapper.java
@@ -7,9 +7,11 @@
 import io.opentelemetry.context.ContextKey;
 import io.sentry.IScopes;
 import io.sentry.Sentry;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@ApiStatus.Internal
 public final class SentryContextWrapper implements Context {
 
   private final @NotNull Context delegate;
diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/api/sentry-opentelemetry-core.api b/sentry-opentelemetry/sentry-opentelemetry-core/api/sentry-opentelemetry-core.api
index f4b4c273f16..6c6fc52bad6 100644
--- a/sentry-opentelemetry/sentry-opentelemetry-core/api/sentry-opentelemetry-core.api
+++ b/sentry-opentelemetry/sentry-opentelemetry-core/api/sentry-opentelemetry-core.api
@@ -15,24 +15,14 @@ public final class io/sentry/opentelemetry/OtelSamplingUtil {
 	public static fun extractSamplingDecisionOrDefault (Lio/opentelemetry/api/common/Attributes;)Lio/sentry/TracesSamplingDecision;
 }
 
-public final class io/sentry/opentelemetry/OtelSpanInfo {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Lio/sentry/protocol/TransactionNameSource;)V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Lio/sentry/protocol/TransactionNameSource;Ljava/util/Map;)V
-	public fun addDataField (Ljava/lang/String;Ljava/lang/Object;)V
-	public fun getDataFields ()Ljava/util/Map;
-	public fun getDescription ()Ljava/lang/String;
-	public fun getOp ()Ljava/lang/String;
-	public fun getTransactionNameSource ()Lio/sentry/protocol/TransactionNameSource;
-}
-
-public final class io/sentry/opentelemetry/PotelSentryPropagator : io/opentelemetry/context/propagation/TextMapPropagator {
+public final class io/sentry/opentelemetry/OtelSentryPropagator : io/opentelemetry/context/propagation/TextMapPropagator {
 	public fun <init> ()V
 	public fun extract (Lio/opentelemetry/context/Context;Ljava/lang/Object;Lio/opentelemetry/context/propagation/TextMapGetter;)Lio/opentelemetry/context/Context;
 	public fun fields ()Ljava/util/Collection;
 	public fun inject (Lio/opentelemetry/context/Context;Ljava/lang/Object;Lio/opentelemetry/context/propagation/TextMapSetter;)V
 }
 
-public final class io/sentry/opentelemetry/PotelSentrySpanProcessor : io/opentelemetry/sdk/trace/SpanProcessor {
+public final class io/sentry/opentelemetry/OtelSentrySpanProcessor : io/opentelemetry/sdk/trace/SpanProcessor {
 	public fun <init> ()V
 	public fun isEndRequired ()Z
 	public fun isStartRequired ()Z
@@ -40,6 +30,16 @@ public final class io/sentry/opentelemetry/PotelSentrySpanProcessor : io/opentel
 	public fun onStart (Lio/opentelemetry/context/Context;Lio/opentelemetry/sdk/trace/ReadWriteSpan;)V
 }
 
+public final class io/sentry/opentelemetry/OtelSpanInfo {
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Lio/sentry/protocol/TransactionNameSource;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Lio/sentry/protocol/TransactionNameSource;Ljava/util/Map;)V
+	public fun addDataField (Ljava/lang/String;Ljava/lang/Object;)V
+	public fun getDataFields ()Ljava/util/Map;
+	public fun getDescription ()Ljava/lang/String;
+	public fun getOp ()Ljava/lang/String;
+	public fun getTransactionNameSource ()Lio/sentry/protocol/TransactionNameSource;
+}
+
 public final class io/sentry/opentelemetry/SentryPropagator : io/opentelemetry/context/propagation/TextMapPropagator {
 	public fun <init> ()V
 	public fun extract (Lio/opentelemetry/context/Context;Ljava/lang/Object;Lio/opentelemetry/context/propagation/TextMapGetter;)Lio/opentelemetry/context/Context;
diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/PotelSentryPropagator.java b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OtelSentryPropagator.java
similarity index 96%
rename from sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/PotelSentryPropagator.java
rename to sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OtelSentryPropagator.java
index 3a9d0718f4b..0b9ee88e085 100644
--- a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/PotelSentryPropagator.java
+++ b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OtelSentryPropagator.java
@@ -26,18 +26,18 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public final class PotelSentryPropagator implements TextMapPropagator {
+public final class OtelSentryPropagator implements TextMapPropagator {
 
   private static final @NotNull List<String> FIELDS =
       Arrays.asList(SentryTraceHeader.SENTRY_TRACE_HEADER, BaggageHeader.BAGGAGE_HEADER);
   private final @NotNull SentryWeakSpanStorage spanStorage = SentryWeakSpanStorage.getInstance();
   private final @NotNull IScopes scopes;
 
-  public PotelSentryPropagator() {
+  public OtelSentryPropagator() {
     this(ScopesAdapter.getInstance());
   }
 
-  PotelSentryPropagator(final @NotNull IScopes scopes) {
+  OtelSentryPropagator(final @NotNull IScopes scopes) {
     this.scopes = scopes;
   }
 
diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/PotelSentrySpanProcessor.java b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OtelSentrySpanProcessor.java
similarity index 97%
rename from sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/PotelSentrySpanProcessor.java
rename to sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OtelSentrySpanProcessor.java
index 9ee3f8e854e..8dd4bd160aa 100644
--- a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/PotelSentrySpanProcessor.java
+++ b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OtelSentrySpanProcessor.java
@@ -23,15 +23,15 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public final class PotelSentrySpanProcessor implements SpanProcessor {
+public final class OtelSentrySpanProcessor implements SpanProcessor {
   private final @NotNull SentryWeakSpanStorage spanStorage = SentryWeakSpanStorage.getInstance();
   private final @NotNull IScopes scopes;
 
-  public PotelSentrySpanProcessor() {
+  public OtelSentrySpanProcessor() {
     this(ScopesAdapter.getInstance());
   }
 
-  PotelSentrySpanProcessor(final @NotNull IScopes scopes) {
+  OtelSentrySpanProcessor(final @NotNull IScopes scopes) {
     this.scopes = scopes;
   }
 
diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentryPropagator.java b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentryPropagator.java
index da411c31262..ffcab9ed541 100644
--- a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentryPropagator.java
+++ b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentryPropagator.java
@@ -24,7 +24,7 @@
 import org.jetbrains.annotations.Nullable;
 
 /**
- * @deprecated please use {@link PotelSentryPropagator} instead
+ * @deprecated please use {@link OtelSentryPropagator} instead
  */
 @Deprecated
 public final class SentryPropagator implements TextMapPropagator {
diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySamplingResult.java b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySamplingResult.java
index c8049f3067b..69acf521346 100644
--- a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySamplingResult.java
+++ b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySamplingResult.java
@@ -4,8 +4,10 @@
 import io.opentelemetry.sdk.trace.samplers.SamplingDecision;
 import io.opentelemetry.sdk.trace.samplers.SamplingResult;
 import io.sentry.TracesSamplingDecision;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
+@ApiStatus.Internal
 public final class SentrySamplingResult implements SamplingResult {
   private final TracesSamplingDecision sentryDecision;
 
diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanExporter.java b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanExporter.java
index 2d82bd23b7a..d3b1cd087c4 100644
--- a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanExporter.java
+++ b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanExporter.java
@@ -64,7 +64,7 @@ public final class SentrySpanExporter implements SpanExporter {
           InternalSemanticAttributes.PARENT_SAMPLED.getKey());
   private static final @NotNull Long SPAN_TIMEOUT = DateUtils.secondsToNanos(5 * 60);
 
-  public static final String TRACE_ORIGIN = "auto.potel";
+  public static final String TRACE_ORIGIN = "auto.otel";
 
   public SentrySpanExporter() {
     this(ScopesAdapter.getInstance());
diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanProcessor.java b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanProcessor.java
index 4f91d29427c..f09c082d72e 100644
--- a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanProcessor.java
+++ b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanProcessor.java
@@ -40,7 +40,7 @@
 import org.jetbrains.annotations.Nullable;
 
 /**
- * @deprecated please use {@link PotelSentrySpanProcessor} instead.
+ * @deprecated please use {@link OtelSentrySpanProcessor} instead.
  */
 @Deprecated
 public final class SentrySpanProcessor implements SpanProcessor {
diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SpanNode.java b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SpanNode.java
index 3f95e50b2b3..e74747d8a1d 100644
--- a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SpanNode.java
+++ b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SpanNode.java
@@ -3,9 +3,11 @@
 import io.opentelemetry.sdk.trace.data.SpanData;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@ApiStatus.Internal
 public final class SpanNode {
   private final @NotNull String id;
   private @Nullable SpanData span;
diff --git a/sentry/src/main/java/io/sentry/DefaultScopesStorage.java b/sentry/src/main/java/io/sentry/DefaultScopesStorage.java
index 1ed80ceea82..6884370c9f8 100644
--- a/sentry/src/main/java/io/sentry/DefaultScopesStorage.java
+++ b/sentry/src/main/java/io/sentry/DefaultScopesStorage.java
@@ -1,8 +1,10 @@
 package io.sentry;
 
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@ApiStatus.Internal
 public final class DefaultScopesStorage implements IScopesStorage {
 
   private static final @NotNull ThreadLocal<IScopes> currentScopes = new ThreadLocal<>();
diff --git a/sentry/src/main/java/io/sentry/IScopesStorage.java b/sentry/src/main/java/io/sentry/IScopesStorage.java
index d067d6bafdb..394510a5285 100644
--- a/sentry/src/main/java/io/sentry/IScopesStorage.java
+++ b/sentry/src/main/java/io/sentry/IScopesStorage.java
@@ -1,8 +1,10 @@
 package io.sentry;
 
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@ApiStatus.Internal
 public interface IScopesStorage {
 
   @NotNull
diff --git a/sentry/src/main/java/io/sentry/ScopesStorageFactory.java b/sentry/src/main/java/io/sentry/ScopesStorageFactory.java
index abaf557f87d..ab136b2ac9a 100644
--- a/sentry/src/main/java/io/sentry/ScopesStorageFactory.java
+++ b/sentry/src/main/java/io/sentry/ScopesStorageFactory.java
@@ -2,9 +2,11 @@
 
 import io.sentry.util.LoadClass;
 import java.lang.reflect.InvocationTargetException;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@ApiStatus.Internal
 public final class ScopesStorageFactory {
 
   private static final String OTEL_SCOPES_STORAGE =
diff --git a/sentry/src/main/java/io/sentry/SentryOptions.java b/sentry/src/main/java/io/sentry/SentryOptions.java
index d46eb8771c8..b8e54952c8f 100644
--- a/sentry/src/main/java/io/sentry/SentryOptions.java
+++ b/sentry/src/main/java/io/sentry/SentryOptions.java
@@ -2727,11 +2727,13 @@ private void addPackageInfo() {
         .addPackage("maven:io.sentry:sentry", BuildConfig.VERSION_NAME);
   }
 
+  @ApiStatus.Internal
   public @NotNull ISpanFactory getSpanFactory() {
     // TODO [POTEL] use a util for checking if OTel is active or similar
     return spanFactory;
   }
 
+  @ApiStatus.Internal
   public void setSpanFactory(final @NotNull ISpanFactory spanFactory) {
     this.spanFactory = spanFactory;
   }
diff --git a/sentry/src/main/java/io/sentry/SentrySpanFactoryHolder.java b/sentry/src/main/java/io/sentry/SentrySpanFactoryHolder.java
index cde9bc2a4fb..19f79d7e505 100644
--- a/sentry/src/main/java/io/sentry/SentrySpanFactoryHolder.java
+++ b/sentry/src/main/java/io/sentry/SentrySpanFactoryHolder.java
@@ -14,6 +14,7 @@
  * into the bootstrap classloader, then this hack should no longer be necessary.
  */
 @ApiStatus.Experimental
+@ApiStatus.Internal
 public final class SentrySpanFactoryHolder {
 
   private static ISpanFactory spanFactory = new DefaultSpanFactory();