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 529491f795..45b544e7ab 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
@@ -240,7 +240,7 @@ public interface ExoPlayer extends Player {
      * @param throwWhenStuckBuffering Whether to throw when the player detects it's stuck buffering.
      * @return This builder.
      */
-    public Builder experimental_setThrowWhenStuckBuffering(boolean throwWhenStuckBuffering) {
+    public Builder experimentalSetThrowWhenStuckBuffering(boolean throwWhenStuckBuffering) {
       this.throwWhenStuckBuffering = throwWhenStuckBuffering;
       return this;
     }
@@ -413,7 +413,7 @@ public interface ExoPlayer extends Player {
         player.experimental_setReleaseTimeoutMs(releaseTimeoutMs);
       }
       if (!throwWhenStuckBuffering) {
-        player.experimental_disableThrowWhenStuckBuffering();
+        player.experimentalDisableThrowWhenStuckBuffering();
       }
 
       return player;
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 21fd06e86c..d7dde1dd4b 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
@@ -205,8 +205,8 @@ import java.util.concurrent.TimeoutException;
    * <p>This method is experimental, and will be renamed or removed in a future release. It should
    * only be called before the player is used.
    */
-  public void experimental_disableThrowWhenStuckBuffering() {
-    internalPlayer.experimental_disableThrowWhenStuckBuffering();
+  public void experimentalDisableThrowWhenStuckBuffering() {
+    internalPlayer.experimentalDisableThrowWhenStuckBuffering();
   }
 
   @Override
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 a28164fe03..df41894c4b 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
@@ -258,7 +258,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
     this.releaseTimeoutMs = releaseTimeoutMs;
   }
 
-  public void experimental_disableThrowWhenStuckBuffering() {
+  public void experimentalDisableThrowWhenStuckBuffering() {
     throwWhenStuckBuffering = false;
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index 34c72f0b03..1db37917c9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -449,7 +449,7 @@ public class SimpleExoPlayer extends BasePlayer
      * @param throwWhenStuckBuffering Whether to throw when the player detects it's stuck buffering.
      * @return This builder.
      */
-    public Builder experimental_setThrowWhenStuckBuffering(boolean throwWhenStuckBuffering) {
+    public Builder experimentalSetThrowWhenStuckBuffering(boolean throwWhenStuckBuffering) {
       this.throwWhenStuckBuffering = throwWhenStuckBuffering;
       return this;
     }
@@ -620,7 +620,7 @@ public class SimpleExoPlayer extends BasePlayer
     wifiLockManager.setEnabled(builder.wakeMode == C.WAKE_MODE_NETWORK);
     deviceInfo = createDeviceInfo(streamVolumeManager);
     if (!builder.throwWhenStuckBuffering) {
-      player.experimental_disableThrowWhenStuckBuffering();
+      player.experimentalDisableThrowWhenStuckBuffering();
     }
 
     sendRendererMessage(C.TRACK_TYPE_AUDIO, Renderer.MSG_SET_AUDIO_ATTRIBUTES, audioAttributes);