diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
index 45b544e7ab..a0e5dfacad 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
@@ -227,7 +227,7 @@ public interface ExoPlayer extends Player {
      *
      * @param timeoutMs The time limit in milliseconds, or 0 for no limit.
      */
-    public Builder experimental_setReleaseTimeoutMs(long timeoutMs) {
+    public Builder experimentalSetReleaseTimeoutMs(long timeoutMs) {
       releaseTimeoutMs = timeoutMs;
       return this;
     }
@@ -410,7 +410,7 @@ public interface ExoPlayer extends Player {
               looper);
 
       if (releaseTimeoutMs > 0) {
-        player.experimental_setReleaseTimeoutMs(releaseTimeoutMs);
+        player.experimentalSetReleaseTimeoutMs(releaseTimeoutMs);
       }
       if (!throwWhenStuckBuffering) {
         player.experimentalDisableThrowWhenStuckBuffering();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index d7dde1dd4b..7443c663a6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -195,8 +195,8 @@ import java.util.concurrent.TimeoutException;
    *
    * @param timeoutMs The time limit in milliseconds, or 0 for no limit.
    */
-  public void experimental_setReleaseTimeoutMs(long timeoutMs) {
-    internalPlayer.experimental_setReleaseTimeoutMs(timeoutMs);
+  public void experimentalSetReleaseTimeoutMs(long timeoutMs) {
+    internalPlayer.experimentalSetReleaseTimeoutMs(timeoutMs);
   }
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index df41894c4b..78f625c9e1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -254,7 +254,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
     handler = clock.createHandler(internalPlaybackThread.getLooper(), this);
   }
 
-  public void experimental_setReleaseTimeoutMs(long releaseTimeoutMs) {
+  public void experimentalSetReleaseTimeoutMs(long releaseTimeoutMs) {
     this.releaseTimeoutMs = releaseTimeoutMs;
   }