--- a/widget/android/GeneratedJNINatives.h
+++ b/widget/android/GeneratedJNINatives.h
@@ -498,50 +498,50 @@ const JNINativeMethod CodecProxy::Native
             ::template Wrap<&Impl::OnOutput>),
 
     mozilla::jni::MakeNativeMethod<CodecProxy::NativeCallbacks::OnOutputFormatChanged_t>(
             mozilla::jni::NativeStub<CodecProxy::NativeCallbacks::OnOutputFormatChanged_t, Impl>
             ::template Wrap<&Impl::OnOutputFormatChanged>)
 };
 
 template<class Impl>
-class GeckoHlsDemuxerWrapper::HlsDemuxerCallbacks::Natives : public mozilla::jni::NativeImpl<HlsDemuxerCallbacks, Impl>
+class GeckoHLSDemuxerWrapper::Callbacks::Natives : public mozilla::jni::NativeImpl<Callbacks, Impl>
 {
 public:
     static const JNINativeMethod methods[2];
 };
 
 template<class Impl>
-const JNINativeMethod GeckoHlsDemuxerWrapper::HlsDemuxerCallbacks::Natives<Impl>::methods[] = {
+const JNINativeMethod GeckoHLSDemuxerWrapper::Callbacks::Natives<Impl>::methods[] = {
 
-    mozilla::jni::MakeNativeMethod<GeckoHlsDemuxerWrapper::HlsDemuxerCallbacks::OnError_t>(
-            mozilla::jni::NativeStub<GeckoHlsDemuxerWrapper::HlsDemuxerCallbacks::OnError_t, Impl>
+    mozilla::jni::MakeNativeMethod<GeckoHLSDemuxerWrapper::Callbacks::OnError_t>(
+            mozilla::jni::NativeStub<GeckoHLSDemuxerWrapper::Callbacks::OnError_t, Impl>
             ::template Wrap<&Impl::OnError>),
 
-    mozilla::jni::MakeNativeMethod<GeckoHlsDemuxerWrapper::HlsDemuxerCallbacks::OnInitialized_t>(
-            mozilla::jni::NativeStub<GeckoHlsDemuxerWrapper::HlsDemuxerCallbacks::OnInitialized_t, Impl>
+    mozilla::jni::MakeNativeMethod<GeckoHLSDemuxerWrapper::Callbacks::OnInitialized_t>(
+            mozilla::jni::NativeStub<GeckoHLSDemuxerWrapper::Callbacks::OnInitialized_t, Impl>
             ::template Wrap<&Impl::OnInitialized>)
 };
 
 template<class Impl>
-class GeckoHlsResourceWrapper::HlsResourceCallbacks::Natives : public mozilla::jni::NativeImpl<HlsResourceCallbacks, Impl>
+class GeckoHLSResourceWrapper::Callbacks::Natives : public mozilla::jni::NativeImpl<Callbacks, Impl>
 {
 public:
     static const JNINativeMethod methods[2];
 };
 
 template<class Impl>
-const JNINativeMethod GeckoHlsResourceWrapper::HlsResourceCallbacks::Natives<Impl>::methods[] = {
+const JNINativeMethod GeckoHLSResourceWrapper::Callbacks::Natives<Impl>::methods[] = {
 
-    mozilla::jni::MakeNativeMethod<GeckoHlsResourceWrapper::HlsResourceCallbacks::OnDataArrived_t>(
-            mozilla::jni::NativeStub<GeckoHlsResourceWrapper::HlsResourceCallbacks::OnDataArrived_t, Impl>
+    mozilla::jni::MakeNativeMethod<GeckoHLSResourceWrapper::Callbacks::OnDataArrived_t>(
+            mozilla::jni::NativeStub<GeckoHLSResourceWrapper::Callbacks::OnDataArrived_t, Impl>
             ::template Wrap<&Impl::OnDataArrived>),
 
-    mozilla::jni::MakeNativeMethod<GeckoHlsResourceWrapper::HlsResourceCallbacks::OnError_t>(
-            mozilla::jni::NativeStub<GeckoHlsResourceWrapper::HlsResourceCallbacks::OnError_t, Impl>
+    mozilla::jni::MakeNativeMethod<GeckoHLSResourceWrapper::Callbacks::OnError_t>(
+            mozilla::jni::NativeStub<GeckoHLSResourceWrapper::Callbacks::OnError_t, Impl>
             ::template Wrap<&Impl::OnError>)
 };
 
 template<class Impl>
 class MediaDrmProxy::NativeMediaDrmProxyCallbacks::Natives : public mozilla::jni::NativeImpl<NativeMediaDrmProxyCallbacks, Impl>
 {
 public:
     static const JNINativeMethod methods[7];

--- a/widget/android/GeneratedJNIWrappers.cpp
+++ b/widget/android/GeneratedJNIWrappers.cpp
@@ -1926,222 +1926,222 @@ auto GeckoAudioInfo::Profile() const -> 
 constexpr char GeckoAudioInfo::Rate_t::name[];
 constexpr char GeckoAudioInfo::Rate_t::signature[];
 
 auto GeckoAudioInfo::Rate() const -> int32_t
 {
     return mozilla::jni::Field<Rate_t>::Get(GeckoAudioInfo::mCtx, nullptr);
 }
 
-const char GeckoHlsDemuxerWrapper::name[] =
-        "org/mozilla/gecko/media/GeckoHlsDemuxerWrapper";
-
-constexpr char GeckoHlsDemuxerWrapper::Create_t::name[];
-constexpr char GeckoHlsDemuxerWrapper::Create_t::signature[];
-
-auto GeckoHlsDemuxerWrapper::Create(mozilla::jni::Object::Param a0, mozilla::jni::Object::Param a1) -> GeckoHlsDemuxerWrapper::LocalRef
+const char GeckoHLSDemuxerWrapper::name[] =
+        "org/mozilla/gecko/media/GeckoHLSDemuxerWrapper";
+
+constexpr char GeckoHLSDemuxerWrapper::Create_t::name[];
+constexpr char GeckoHLSDemuxerWrapper::Create_t::signature[];
+
+auto GeckoHLSDemuxerWrapper::Create(mozilla::jni::Object::Param a0, mozilla::jni::Object::Param a1) -> GeckoHLSDemuxerWrapper::LocalRef
 {
-    return mozilla::jni::Method<Create_t>::Call(GeckoHlsDemuxerWrapper::Context(), nullptr, a0, a1);
+    return mozilla::jni::Method<Create_t>::Call(GeckoHLSDemuxerWrapper::Context(), nullptr, a0, a1);
 }
 
-constexpr char GeckoHlsDemuxerWrapper::Destroy_t::name[];
-constexpr char GeckoHlsDemuxerWrapper::Destroy_t::signature[];
-
-auto GeckoHlsDemuxerWrapper::Destroy() const -> void
+constexpr char GeckoHLSDemuxerWrapper::Destroy_t::name[];
+constexpr char GeckoHLSDemuxerWrapper::Destroy_t::signature[];
+
+auto GeckoHLSDemuxerWrapper::Destroy() const -> void
 {
-    return mozilla::jni::Method<Destroy_t>::Call(GeckoHlsDemuxerWrapper::mCtx, nullptr);
+    return mozilla::jni::Method<Destroy_t>::Call(GeckoHLSDemuxerWrapper::mCtx, nullptr);
 }
 
-constexpr char GeckoHlsDemuxerWrapper::GetAudioInfo_t::name[];
-constexpr char GeckoHlsDemuxerWrapper::GetAudioInfo_t::signature[];
-
-auto GeckoHlsDemuxerWrapper::GetAudioInfo(int32_t a0) const -> mozilla::jni::Object::LocalRef
+constexpr char GeckoHLSDemuxerWrapper::GetAudioInfo_t::name[];
+constexpr char GeckoHLSDemuxerWrapper::GetAudioInfo_t::signature[];
+
+auto GeckoHLSDemuxerWrapper::GetAudioInfo(int32_t a0) const -> mozilla::jni::Object::LocalRef
 {
-    return mozilla::jni::Method<GetAudioInfo_t>::Call(GeckoHlsDemuxerWrapper::mCtx, nullptr, a0);
+    return mozilla::jni::Method<GetAudioInfo_t>::Call(GeckoHLSDemuxerWrapper::mCtx, nullptr, a0);
 }
 
-constexpr char GeckoHlsDemuxerWrapper::GetBuffered_t::name[];
-constexpr char GeckoHlsDemuxerWrapper::GetBuffered_t::signature[];
-
-auto GeckoHlsDemuxerWrapper::GetBuffered() const -> int64_t
+constexpr char GeckoHLSDemuxerWrapper::GetBuffered_t::name[];
+constexpr char GeckoHLSDemuxerWrapper::GetBuffered_t::signature[];
+
+auto GeckoHLSDemuxerWrapper::GetBuffered() const -> int64_t
 {
-    return mozilla::jni::Method<GetBuffered_t>::Call(GeckoHlsDemuxerWrapper::mCtx, nullptr);
+    return mozilla::jni::Method<GetBuffered_t>::Call(GeckoHLSDemuxerWrapper::mCtx, nullptr);
 }
 
-constexpr char GeckoHlsDemuxerWrapper::GetNextKeyFrameTime_t::name[];
-constexpr char GeckoHlsDemuxerWrapper::GetNextKeyFrameTime_t::signature[];
-
-auto GeckoHlsDemuxerWrapper::GetNextKeyFrameTime() const -> int64_t
+constexpr char GeckoHLSDemuxerWrapper::GetNextKeyFrameTime_t::name[];
+constexpr char GeckoHLSDemuxerWrapper::GetNextKeyFrameTime_t::signature[];
+
+auto GeckoHLSDemuxerWrapper::GetNextKeyFrameTime() const -> int64_t
 {
-    return mozilla::jni::Method<GetNextKeyFrameTime_t>::Call(GeckoHlsDemuxerWrapper::mCtx, nullptr);
+    return mozilla::jni::Method<GetNextKeyFrameTime_t>::Call(GeckoHLSDemuxerWrapper::mCtx, nullptr);
 }
 
-constexpr char GeckoHlsDemuxerWrapper::GetNumberOfTracks_t::name[];
-constexpr char GeckoHlsDemuxerWrapper::GetNumberOfTracks_t::signature[];
-
-auto GeckoHlsDemuxerWrapper::GetNumberOfTracks(int32_t a0) const -> int32_t
+constexpr char GeckoHLSDemuxerWrapper::GetNumberOfTracks_t::name[];
+constexpr char GeckoHLSDemuxerWrapper::GetNumberOfTracks_t::signature[];
+
+auto GeckoHLSDemuxerWrapper::GetNumberOfTracks(int32_t a0) const -> int32_t
 {
-    return mozilla::jni::Method<GetNumberOfTracks_t>::Call(GeckoHlsDemuxerWrapper::mCtx, nullptr, a0);
+    return mozilla::jni::Method<GetNumberOfTracks_t>::Call(GeckoHLSDemuxerWrapper::mCtx, nullptr, a0);
 }
 
-constexpr char GeckoHlsDemuxerWrapper::GetSamples_t::name[];
-constexpr char GeckoHlsDemuxerWrapper::GetSamples_t::signature[];
-
-auto GeckoHlsDemuxerWrapper::GetSamples(int32_t a0, int32_t a1) const -> mozilla::jni::ObjectArray::LocalRef
+constexpr char GeckoHLSDemuxerWrapper::GetSamples_t::name[];
+constexpr char GeckoHLSDemuxerWrapper::GetSamples_t::signature[];
+
+auto GeckoHLSDemuxerWrapper::GetSamples(int32_t a0, int32_t a1) const -> mozilla::jni::ObjectArray::LocalRef
 {
-    return mozilla::jni::Method<GetSamples_t>::Call(GeckoHlsDemuxerWrapper::mCtx, nullptr, a0, a1);
+    return mozilla::jni::Method<GetSamples_t>::Call(GeckoHLSDemuxerWrapper::mCtx, nullptr, a0, a1);
 }
 
-constexpr char GeckoHlsDemuxerWrapper::GetVideoInfo_t::name[];
-constexpr char GeckoHlsDemuxerWrapper::GetVideoInfo_t::signature[];
-
-auto GeckoHlsDemuxerWrapper::GetVideoInfo(int32_t a0) const -> mozilla::jni::Object::LocalRef
+constexpr char GeckoHLSDemuxerWrapper::GetVideoInfo_t::name[];
+constexpr char GeckoHLSDemuxerWrapper::GetVideoInfo_t::signature[];
+
+auto GeckoHLSDemuxerWrapper::GetVideoInfo(int32_t a0) const -> mozilla::jni::Object::LocalRef
 {
-    return mozilla::jni::Method<GetVideoInfo_t>::Call(GeckoHlsDemuxerWrapper::mCtx, nullptr, a0);
+    return mozilla::jni::Method<GetVideoInfo_t>::Call(GeckoHLSDemuxerWrapper::mCtx, nullptr, a0);
 }
 
-constexpr char GeckoHlsDemuxerWrapper::IsLiveStream_t::name[];
-constexpr char GeckoHlsDemuxerWrapper::IsLiveStream_t::signature[];
-
-auto GeckoHlsDemuxerWrapper::IsLiveStream() const -> bool
+constexpr char GeckoHLSDemuxerWrapper::IsLiveStream_t::name[];
+constexpr char GeckoHLSDemuxerWrapper::IsLiveStream_t::signature[];
+
+auto GeckoHLSDemuxerWrapper::IsLiveStream() const -> bool
 {
-    return mozilla::jni::Method<IsLiveStream_t>::Call(GeckoHlsDemuxerWrapper::mCtx, nullptr);
+    return mozilla::jni::Method<IsLiveStream_t>::Call(GeckoHLSDemuxerWrapper::mCtx, nullptr);
 }
 
-constexpr char GeckoHlsDemuxerWrapper::Seek_t::name[];
-constexpr char GeckoHlsDemuxerWrapper::Seek_t::signature[];
-
-auto GeckoHlsDemuxerWrapper::Seek(int64_t a0) const -> bool
+constexpr char GeckoHLSDemuxerWrapper::Seek_t::name[];
+constexpr char GeckoHLSDemuxerWrapper::Seek_t::signature[];
+
+auto GeckoHLSDemuxerWrapper::Seek(int64_t a0) const -> bool
 {
-    return mozilla::jni::Method<Seek_t>::Call(GeckoHlsDemuxerWrapper::mCtx, nullptr, a0);
+    return mozilla::jni::Method<Seek_t>::Call(GeckoHLSDemuxerWrapper::mCtx, nullptr, a0);
 }
 
-const char GeckoHlsDemuxerWrapper::HlsDemuxerCallbacks::name[] =
-        "org/mozilla/gecko/media/GeckoHlsDemuxerWrapper$HlsDemuxerCallbacks";
-
-constexpr char GeckoHlsDemuxerWrapper::HlsDemuxerCallbacks::New_t::name[];
-constexpr char GeckoHlsDemuxerWrapper::HlsDemuxerCallbacks::New_t::signature[];
-
-auto GeckoHlsDemuxerWrapper::HlsDemuxerCallbacks::New() -> HlsDemuxerCallbacks::LocalRef
+const char GeckoHLSDemuxerWrapper::Callbacks::name[] =
+        "org/mozilla/gecko/media/GeckoHLSDemuxerWrapper$Callbacks";
+
+constexpr char GeckoHLSDemuxerWrapper::Callbacks::New_t::name[];
+constexpr char GeckoHLSDemuxerWrapper::Callbacks::New_t::signature[];
+
+auto GeckoHLSDemuxerWrapper::Callbacks::New() -> Callbacks::LocalRef
 {
-    return mozilla::jni::Constructor<New_t>::Call(HlsDemuxerCallbacks::Context(), nullptr);
+    return mozilla::jni::Constructor<New_t>::Call(Callbacks::Context(), nullptr);
 }
 
-constexpr char GeckoHlsDemuxerWrapper::HlsDemuxerCallbacks::OnError_t::name[];
-constexpr char GeckoHlsDemuxerWrapper::HlsDemuxerCallbacks::OnError_t::signature[];
-
-constexpr char GeckoHlsDemuxerWrapper::HlsDemuxerCallbacks::OnInitialized_t::name[];
-constexpr char GeckoHlsDemuxerWrapper::HlsDemuxerCallbacks::OnInitialized_t::signature[];
-
-const char GeckoHlsResourceWrapper::name[] =
-        "org/mozilla/gecko/media/GeckoHlsResourceWrapper";
-
-constexpr char GeckoHlsResourceWrapper::GetPlayer_t::name[];
-constexpr char GeckoHlsResourceWrapper::GetPlayer_t::signature[];
-
-auto GeckoHlsResourceWrapper::GetPlayer() const -> mozilla::jni::Object::LocalRef
+constexpr char GeckoHLSDemuxerWrapper::Callbacks::OnError_t::name[];
+constexpr char GeckoHLSDemuxerWrapper::Callbacks::OnError_t::signature[];
+
+constexpr char GeckoHLSDemuxerWrapper::Callbacks::OnInitialized_t::name[];
+constexpr char GeckoHLSDemuxerWrapper::Callbacks::OnInitialized_t::signature[];
+
+const char GeckoHLSResourceWrapper::name[] =
+        "org/mozilla/gecko/media/GeckoHLSResourceWrapper";
+
+constexpr char GeckoHLSResourceWrapper::GetPlayer_t::name[];
+constexpr char GeckoHLSResourceWrapper::GetPlayer_t::signature[];
+
+auto GeckoHLSResourceWrapper::GetPlayer() const -> mozilla::jni::Object::LocalRef
 {
-    return mozilla::jni::Method<GetPlayer_t>::Call(GeckoHlsResourceWrapper::mCtx, nullptr);
+    return mozilla::jni::Method<GetPlayer_t>::Call(GeckoHLSResourceWrapper::mCtx, nullptr);
 }
 
-constexpr char GeckoHlsResourceWrapper::Create_t::name[];
-constexpr char GeckoHlsResourceWrapper::Create_t::signature[];
-
-auto GeckoHlsResourceWrapper::Create(mozilla::jni::String::Param a0, mozilla::jni::Object::Param a1) -> GeckoHlsResourceWrapper::LocalRef
+constexpr char GeckoHLSResourceWrapper::Create_t::name[];
+constexpr char GeckoHLSResourceWrapper::Create_t::signature[];
+
+auto GeckoHLSResourceWrapper::Create(mozilla::jni::String::Param a0, mozilla::jni::Object::Param a1) -> GeckoHLSResourceWrapper::LocalRef
 {
-    return mozilla::jni::Method<Create_t>::Call(GeckoHlsResourceWrapper::Context(), nullptr, a0, a1);
+    return mozilla::jni::Method<Create_t>::Call(GeckoHLSResourceWrapper::Context(), nullptr, a0, a1);
 }
 
-constexpr char GeckoHlsResourceWrapper::Destroy_t::name[];
-constexpr char GeckoHlsResourceWrapper::Destroy_t::signature[];
-
-auto GeckoHlsResourceWrapper::Destroy() const -> void
+constexpr char GeckoHLSResourceWrapper::Destroy_t::name[];
+constexpr char GeckoHLSResourceWrapper::Destroy_t::signature[];
+
+auto GeckoHLSResourceWrapper::Destroy() const -> void
 {
-    return mozilla::jni::Method<Destroy_t>::Call(GeckoHlsResourceWrapper::mCtx, nullptr);
+    return mozilla::jni::Method<Destroy_t>::Call(GeckoHLSResourceWrapper::mCtx, nullptr);
 }
 
-const char GeckoHlsResourceWrapper::HlsResourceCallbacks::name[] =
-        "org/mozilla/gecko/media/GeckoHlsResourceWrapper$HlsResourceCallbacks";
-
-constexpr char GeckoHlsResourceWrapper::HlsResourceCallbacks::New_t::name[];
-constexpr char GeckoHlsResourceWrapper::HlsResourceCallbacks::New_t::signature[];
-
-auto GeckoHlsResourceWrapper::HlsResourceCallbacks::New() -> HlsResourceCallbacks::LocalRef
+const char GeckoHLSResourceWrapper::Callbacks::name[] =
+        "org/mozilla/gecko/media/GeckoHLSResourceWrapper$Callbacks";
+
+constexpr char GeckoHLSResourceWrapper::Callbacks::New_t::name[];
+constexpr char GeckoHLSResourceWrapper::Callbacks::New_t::signature[];
+
+auto GeckoHLSResourceWrapper::Callbacks::New() -> Callbacks::LocalRef
 {
-    return mozilla::jni::Constructor<New_t>::Call(HlsResourceCallbacks::Context(), nullptr);
+    return mozilla::jni::Constructor<New_t>::Call(Callbacks::Context(), nullptr);
 }
 
-constexpr char GeckoHlsResourceWrapper::HlsResourceCallbacks::OnDataArrived_t::name[];
-constexpr char GeckoHlsResourceWrapper::HlsResourceCallbacks::OnDataArrived_t::signature[];
-
-constexpr char GeckoHlsResourceWrapper::HlsResourceCallbacks::OnError_t::name[];
-constexpr char GeckoHlsResourceWrapper::HlsResourceCallbacks::OnError_t::signature[];
-
-const char GeckoHlsSample::name[] =
-        "org/mozilla/gecko/media/GeckoHlsSample";
-
-constexpr char GeckoHlsSample::IsEOS_t::name[];
-constexpr char GeckoHlsSample::IsEOS_t::signature[];
-
-auto GeckoHlsSample::IsEOS() const -> bool
+constexpr char GeckoHLSResourceWrapper::Callbacks::OnDataArrived_t::name[];
+constexpr char GeckoHLSResourceWrapper::Callbacks::OnDataArrived_t::signature[];
+
+constexpr char GeckoHLSResourceWrapper::Callbacks::OnError_t::name[];
+constexpr char GeckoHLSResourceWrapper::Callbacks::OnError_t::signature[];
+
+const char GeckoHLSSample::name[] =
+        "org/mozilla/gecko/media/GeckoHLSSample";
+
+constexpr char GeckoHLSSample::IsEOS_t::name[];
+constexpr char GeckoHLSSample::IsEOS_t::signature[];
+
+auto GeckoHLSSample::IsEOS() const -> bool
 {
-    return mozilla::jni::Method<IsEOS_t>::Call(GeckoHlsSample::mCtx, nullptr);
+    return mozilla::jni::Method<IsEOS_t>::Call(GeckoHLSSample::mCtx, nullptr);
 }
 
-constexpr char GeckoHlsSample::IsKeyFrame_t::name[];
-constexpr char GeckoHlsSample::IsKeyFrame_t::signature[];
-
-auto GeckoHlsSample::IsKeyFrame() const -> bool
+constexpr char GeckoHLSSample::IsKeyFrame_t::name[];
+constexpr char GeckoHLSSample::IsKeyFrame_t::signature[];
+
+auto GeckoHLSSample::IsKeyFrame() const -> bool
 {
-    return mozilla::jni::Method<IsKeyFrame_t>::Call(GeckoHlsSample::mCtx, nullptr);
+    return mozilla::jni::Method<IsKeyFrame_t>::Call(GeckoHLSSample::mCtx, nullptr);
 }
 
-constexpr char GeckoHlsSample::WriteToByteBuffer_t::name[];
-constexpr char GeckoHlsSample::WriteToByteBuffer_t::signature[];
-
-auto GeckoHlsSample::WriteToByteBuffer(mozilla::jni::ByteBuffer::Param a0) const -> void
+constexpr char GeckoHLSSample::WriteToByteBuffer_t::name[];
+constexpr char GeckoHLSSample::WriteToByteBuffer_t::signature[];
+
+auto GeckoHLSSample::WriteToByteBuffer(mozilla::jni::ByteBuffer::Param a0) const -> void
 {
-    return mozilla::jni::Method<WriteToByteBuffer_t>::Call(GeckoHlsSample::mCtx, nullptr, a0);
+    return mozilla::jni::Method<WriteToByteBuffer_t>::Call(GeckoHLSSample::mCtx, nullptr, a0);
 }
 
-constexpr char GeckoHlsSample::CryptoInfo_t::name[];
-constexpr char GeckoHlsSample::CryptoInfo_t::signature[];
-
-auto GeckoHlsSample::CryptoInfo() const -> mozilla::jni::Object::LocalRef
+constexpr char GeckoHLSSample::CryptoInfo_t::name[];
+constexpr char GeckoHLSSample::CryptoInfo_t::signature[];
+
+auto GeckoHLSSample::CryptoInfo() const -> mozilla::jni::Object::LocalRef
 {
-    return mozilla::jni::Field<CryptoInfo_t>::Get(GeckoHlsSample::mCtx, nullptr);
+    return mozilla::jni::Field<CryptoInfo_t>::Get(GeckoHLSSample::mCtx, nullptr);
 }
 
-constexpr char GeckoHlsSample::Duration_t::name[];
-constexpr char GeckoHlsSample::Duration_t::signature[];
-
-auto GeckoHlsSample::Duration() const -> int64_t
+constexpr char GeckoHLSSample::Duration_t::name[];
+constexpr char GeckoHLSSample::Duration_t::signature[];
+
+auto GeckoHLSSample::Duration() const -> int64_t
 {
-    return mozilla::jni::Field<Duration_t>::Get(GeckoHlsSample::mCtx, nullptr);
+    return mozilla::jni::Field<Duration_t>::Get(GeckoHLSSample::mCtx, nullptr);
 }
 
-auto GeckoHlsSample::Duration(int64_t a0) const -> void
+auto GeckoHLSSample::Duration(int64_t a0) const -> void
 {
-    return mozilla::jni::Field<Duration_t>::Set(GeckoHlsSample::mCtx, nullptr, a0);
+    return mozilla::jni::Field<Duration_t>::Set(GeckoHLSSample::mCtx, nullptr, a0);
 }
 
-constexpr char GeckoHlsSample::FormatIndex_t::name[];
-constexpr char GeckoHlsSample::FormatIndex_t::signature[];
-
-auto GeckoHlsSample::FormatIndex() const -> int32_t
+constexpr char GeckoHLSSample::FormatIndex_t::name[];
+constexpr char GeckoHLSSample::FormatIndex_t::signature[];
+
+auto GeckoHLSSample::FormatIndex() const -> int32_t
 {
-    return mozilla::jni::Field<FormatIndex_t>::Get(GeckoHlsSample::mCtx, nullptr);
+    return mozilla::jni::Field<FormatIndex_t>::Get(GeckoHLSSample::mCtx, nullptr);
 }
 
-constexpr char GeckoHlsSample::Info_t::name[];
-constexpr char GeckoHlsSample::Info_t::signature[];
-
-auto GeckoHlsSample::Info() const -> mozilla::jni::Object::LocalRef
+constexpr char GeckoHLSSample::Info_t::name[];
+constexpr char GeckoHLSSample::Info_t::signature[];
+
+auto GeckoHLSSample::Info() const -> mozilla::jni::Object::LocalRef
 {
-    return mozilla::jni::Field<Info_t>::Get(GeckoHlsSample::mCtx, nullptr);
+    return mozilla::jni::Field<Info_t>::Get(GeckoHLSSample::mCtx, nullptr);
 }
 
 const char GeckoVideoInfo::name[] =
         "org/mozilla/gecko/media/GeckoVideoInfo";
 
 constexpr char GeckoVideoInfo::New_t::name[];
 constexpr char GeckoVideoInfo::New_t::signature[];
 

--- a/widget/android/GeneratedJNIWrappers.h
+++ b/widget/android/GeneratedJNIWrappers.h
@@ -5556,48 +5556,48 @@ public:
 
     auto Rate() const -> int32_t;
 
     static const mozilla::jni::CallingThread callingThread =
             mozilla::jni::CallingThread::ANY;
 
 };
 
-class GeckoHlsDemuxerWrapper : public mozilla::jni::ObjectBase<GeckoHlsDemuxerWrapper>
+class GeckoHLSDemuxerWrapper : public mozilla::jni::ObjectBase<GeckoHLSDemuxerWrapper>
 {
 public:
     static const char name[];
 
-    explicit GeckoHlsDemuxerWrapper(const Context& ctx) : ObjectBase<GeckoHlsDemuxerWrapper>(ctx) {}
-
-    class HlsDemuxerCallbacks;
+    explicit GeckoHLSDemuxerWrapper(const Context& ctx) : ObjectBase<GeckoHLSDemuxerWrapper>(ctx) {}
+
+    class Callbacks;
 
     struct Create_t {
-        typedef GeckoHlsDemuxerWrapper Owner;
-        typedef GeckoHlsDemuxerWrapper::LocalRef ReturnType;
-        typedef GeckoHlsDemuxerWrapper::Param SetterType;
+        typedef GeckoHLSDemuxerWrapper Owner;
+        typedef GeckoHLSDemuxerWrapper::LocalRef ReturnType;
+        typedef GeckoHLSDemuxerWrapper::Param SetterType;
         typedef mozilla::jni::Args<
                 mozilla::jni::Object::Param,
                 mozilla::jni::Object::Param> Args;
         static constexpr char name[] = "create";
         static constexpr char signature[] =
-                "(Lorg/mozilla/gecko/media/GeckoHlsPlayer;Lorg/mozilla/gecko/media/GeckoHlsPlayer$DemuxerCallbacks;)Lorg/mozilla/gecko/media/GeckoHlsDemuxerWrapper;";
+                "(Lorg/mozilla/gecko/media/GeckoHlsPlayer;Lorg/mozilla/gecko/media/GeckoHlsPlayer$DemuxerCallbacks;)Lorg/mozilla/gecko/media/GeckoHLSDemuxerWrapper;";
         static const bool isStatic = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
         static const mozilla::jni::CallingThread callingThread =
                 mozilla::jni::CallingThread::GECKO;
         static const mozilla::jni::DispatchTarget dispatchTarget =
                 mozilla::jni::DispatchTarget::CURRENT;
     };
 
-    static auto Create(mozilla::jni::Object::Param, mozilla::jni::Object::Param) -> GeckoHlsDemuxerWrapper::LocalRef;
+    static auto Create(mozilla::jni::Object::Param, mozilla::jni::Object::Param) -> GeckoHLSDemuxerWrapper::LocalRef;
 
     struct Destroy_t {
-        typedef GeckoHlsDemuxerWrapper Owner;
+        typedef GeckoHLSDemuxerWrapper Owner;
         typedef void ReturnType;
         typedef void SetterType;
         typedef mozilla::jni::Args<> Args;
         static constexpr char name[] = "destroy";
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
@@ -5606,17 +5606,17 @@ public:
                 mozilla::jni::CallingThread::ANY;
         static const mozilla::jni::DispatchTarget dispatchTarget =
                 mozilla::jni::DispatchTarget::CURRENT;
     };
 
     auto Destroy() const -> void;
 
     struct GetAudioInfo_t {
-        typedef GeckoHlsDemuxerWrapper Owner;
+        typedef GeckoHLSDemuxerWrapper Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
         typedef mozilla::jni::Object::Param SetterType;
         typedef mozilla::jni::Args<
                 int32_t> Args;
         static constexpr char name[] = "getAudioInfo";
         static constexpr char signature[] =
                 "(I)Lorg/mozilla/gecko/media/GeckoAudioInfo;";
         static const bool isStatic = false;
@@ -5626,17 +5626,17 @@ public:
                 mozilla::jni::CallingThread::ANY;
         static const mozilla::jni::DispatchTarget dispatchTarget =
                 mozilla::jni::DispatchTarget::CURRENT;
     };
 
     auto GetAudioInfo(int32_t) const -> mozilla::jni::Object::LocalRef;
 
     struct GetBuffered_t {
-        typedef GeckoHlsDemuxerWrapper Owner;
+        typedef GeckoHLSDemuxerWrapper Owner;
         typedef int64_t ReturnType;
         typedef int64_t SetterType;
         typedef mozilla::jni::Args<> Args;
         static constexpr char name[] = "getBuffered";
         static constexpr char signature[] =
                 "()J";
         static const bool isStatic = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
@@ -5645,17 +5645,17 @@ public:
                 mozilla::jni::CallingThread::ANY;
         static const mozilla::jni::DispatchTarget dispatchTarget =
                 mozilla::jni::DispatchTarget::CURRENT;
     };
 
     auto GetBuffered() const -> int64_t;
 
     struct GetNextKeyFrameTime_t {
-        typedef GeckoHlsDemuxerWrapper Owner;
+        typedef GeckoHLSDemuxerWrapper Owner;
         typedef int64_t ReturnType;
         typedef int64_t SetterType;
         typedef mozilla::jni::Args<> Args;
         static constexpr char name[] = "getNextKeyFrameTime";
         static constexpr char signature[] =
                 "()J";
         static const bool isStatic = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
@@ -5664,17 +5664,17 @@ public:
                 mozilla::jni::CallingThread::ANY;
         static const mozilla::jni::DispatchTarget dispatchTarget =
                 mozilla::jni::DispatchTarget::CURRENT;
     };
 
     auto GetNextKeyFrameTime() const -> int64_t;
 
     struct GetNumberOfTracks_t {
-        typedef GeckoHlsDemuxerWrapper Owner;
+        typedef GeckoHLSDemuxerWrapper Owner;
         typedef int32_t ReturnType;
         typedef int32_t SetterType;
         typedef mozilla::jni::Args<
                 int32_t> Args;
         static constexpr char name[] = "getNumberOfTracks";
         static constexpr char signature[] =
                 "(I)I";
         static const bool isStatic = false;
@@ -5684,38 +5684,38 @@ public:
                 mozilla::jni::CallingThread::ANY;
         static const mozilla::jni::DispatchTarget dispatchTarget =
                 mozilla::jni::DispatchTarget::CURRENT;
     };
 
     auto GetNumberOfTracks(int32_t) const -> int32_t;
 
     struct GetSamples_t {
-        typedef GeckoHlsDemuxerWrapper Owner;
+        typedef GeckoHLSDemuxerWrapper Owner;
         typedef mozilla::jni::ObjectArray::LocalRef ReturnType;
         typedef mozilla::jni::ObjectArray::Param SetterType;
         typedef mozilla::jni::Args<
                 int32_t,
                 int32_t> Args;
         static constexpr char name[] = "getSamples";
         static constexpr char signature[] =
-                "(II)[Lorg/mozilla/gecko/media/GeckoHlsSample;";
+                "(II)[Lorg/mozilla/gecko/media/GeckoHLSSample;";
         static const bool isStatic = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
         static const mozilla::jni::CallingThread callingThread =
                 mozilla::jni::CallingThread::ANY;
         static const mozilla::jni::DispatchTarget dispatchTarget =
                 mozilla::jni::DispatchTarget::CURRENT;
     };
 
     auto GetSamples(int32_t, int32_t) const -> mozilla::jni::ObjectArray::LocalRef;
 
     struct GetVideoInfo_t {
-        typedef GeckoHlsDemuxerWrapper Owner;
+        typedef GeckoHLSDemuxerWrapper Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
         typedef mozilla::jni::Object::Param SetterType;
         typedef mozilla::jni::Args<
                 int32_t> Args;
         static constexpr char name[] = "getVideoInfo";
         static constexpr char signature[] =
                 "(I)Lorg/mozilla/gecko/media/GeckoVideoInfo;";
         static const bool isStatic = false;
@@ -5725,17 +5725,17 @@ public:
                 mozilla::jni::CallingThread::ANY;
         static const mozilla::jni::DispatchTarget dispatchTarget =
                 mozilla::jni::DispatchTarget::CURRENT;
     };
 
     auto GetVideoInfo(int32_t) const -> mozilla::jni::Object::LocalRef;
 
     struct IsLiveStream_t {
-        typedef GeckoHlsDemuxerWrapper Owner;
+        typedef GeckoHLSDemuxerWrapper Owner;
         typedef bool ReturnType;
         typedef bool SetterType;
         typedef mozilla::jni::Args<> Args;
         static constexpr char name[] = "isLiveStream";
         static constexpr char signature[] =
                 "()Z";
         static const bool isStatic = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
@@ -5744,17 +5744,17 @@ public:
                 mozilla::jni::CallingThread::ANY;
         static const mozilla::jni::DispatchTarget dispatchTarget =
                 mozilla::jni::DispatchTarget::CURRENT;
     };
 
     auto IsLiveStream() const -> bool;
 
     struct Seek_t {
-        typedef GeckoHlsDemuxerWrapper Owner;
+        typedef GeckoHLSDemuxerWrapper Owner;
         typedef bool ReturnType;
         typedef bool SetterType;
         typedef mozilla::jni::Args<
                 int64_t> Args;
         static constexpr char name[] = "seek";
         static constexpr char signature[] =
                 "(J)Z";
         static const bool isStatic = false;
@@ -5768,44 +5768,44 @@ public:
 
     auto Seek(int64_t) const -> bool;
 
     static const mozilla::jni::CallingThread callingThread =
             mozilla::jni::CallingThread::ANY;
 
 };
 
-class GeckoHlsDemuxerWrapper::HlsDemuxerCallbacks : public mozilla::jni::ObjectBase<HlsDemuxerCallbacks>
+class GeckoHLSDemuxerWrapper::Callbacks : public mozilla::jni::ObjectBase<Callbacks>
 {
 public:
     static const char name[];
 
-    explicit HlsDemuxerCallbacks(const Context& ctx) : ObjectBase<HlsDemuxerCallbacks>(ctx) {}
+    explicit Callbacks(const Context& ctx) : ObjectBase<Callbacks>(ctx) {}
 
     struct New_t {
-        typedef HlsDemuxerCallbacks Owner;
-        typedef HlsDemuxerCallbacks::LocalRef ReturnType;
-        typedef HlsDemuxerCallbacks::Param SetterType;
+        typedef Callbacks Owner;
+        typedef Callbacks::LocalRef ReturnType;
+        typedef Callbacks::Param SetterType;
         typedef mozilla::jni::Args<> Args;
         static constexpr char name[] = "<init>";
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
         static const mozilla::jni::CallingThread callingThread =
                 mozilla::jni::CallingThread::GECKO;
         static const mozilla::jni::DispatchTarget dispatchTarget =
                 mozilla::jni::DispatchTarget::CURRENT;
     };
 
-    static auto New() -> HlsDemuxerCallbacks::LocalRef;
+    static auto New() -> Callbacks::LocalRef;
 
     struct OnError_t {
-        typedef HlsDemuxerCallbacks Owner;
+        typedef Callbacks Owner;
         typedef void ReturnType;
         typedef void SetterType;
         typedef mozilla::jni::Args<
                 int32_t> Args;
         static constexpr char name[] = "onError";
         static constexpr char signature[] =
                 "(I)V";
         static const bool isStatic = false;
@@ -5813,17 +5813,17 @@ public:
                 mozilla::jni::ExceptionMode::ABORT;
         static const mozilla::jni::CallingThread callingThread =
                 mozilla::jni::CallingThread::ANY;
         static const mozilla::jni::DispatchTarget dispatchTarget =
                 mozilla::jni::DispatchTarget::CURRENT;
     };
 
     struct OnInitialized_t {
-        typedef HlsDemuxerCallbacks Owner;
+        typedef Callbacks Owner;
         typedef void ReturnType;
         typedef void SetterType;
         typedef mozilla::jni::Args<
                 bool,
                 bool> Args;
         static constexpr char name[] = "onInitialized";
         static constexpr char signature[] =
                 "(ZZ)V";
@@ -5837,27 +5837,27 @@ public:
     };
 
     static const mozilla::jni::CallingThread callingThread =
             mozilla::jni::CallingThread::ANY;
 
     template<class Impl> class Natives;
 };
 
-class GeckoHlsResourceWrapper : public mozilla::jni::ObjectBase<GeckoHlsResourceWrapper>
+class GeckoHLSResourceWrapper : public mozilla::jni::ObjectBase<GeckoHLSResourceWrapper>
 {
 public:
     static const char name[];
 
-    explicit GeckoHlsResourceWrapper(const Context& ctx) : ObjectBase<GeckoHlsResourceWrapper>(ctx) {}
-
-    class HlsResourceCallbacks;
+    explicit GeckoHLSResourceWrapper(const Context& ctx) : ObjectBase<GeckoHLSResourceWrapper>(ctx) {}
+
+    class Callbacks;
 
     struct GetPlayer_t {
-        typedef GeckoHlsResourceWrapper Owner;
+        typedef GeckoHLSResourceWrapper Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
         typedef mozilla::jni::Object::Param SetterType;
         typedef mozilla::jni::Args<> Args;
         static constexpr char name[] = "GetPlayer";
         static constexpr char signature[] =
                 "()Lorg/mozilla/gecko/media/GeckoHlsPlayer;";
         static const bool isStatic = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
@@ -5866,38 +5866,38 @@ public:
                 mozilla::jni::CallingThread::GECKO;
         static const mozilla::jni::DispatchTarget dispatchTarget =
                 mozilla::jni::DispatchTarget::CURRENT;
     };
 
     auto GetPlayer() const -> mozilla::jni::Object::LocalRef;
 
     struct Create_t {
-        typedef GeckoHlsResourceWrapper Owner;
-        typedef GeckoHlsResourceWrapper::LocalRef ReturnType;
-        typedef GeckoHlsResourceWrapper::Param SetterType;
+        typedef GeckoHLSResourceWrapper Owner;
+        typedef GeckoHLSResourceWrapper::LocalRef ReturnType;
+        typedef GeckoHLSResourceWrapper::Param SetterType;
         typedef mozilla::jni::Args<
                 mozilla::jni::String::Param,
                 mozilla::jni::Object::Param> Args;
         static constexpr char name[] = "create";
         static constexpr char signature[] =
-                "(Ljava/lang/String;Lorg/mozilla/gecko/media/GeckoHlsPlayer$ResourceCallbacks;)Lorg/mozilla/gecko/media/GeckoHlsResourceWrapper;";
+                "(Ljava/lang/String;Lorg/mozilla/gecko/media/GeckoHlsPlayer$ResourceCallbacks;)Lorg/mozilla/gecko/media/GeckoHLSResourceWrapper;";
         static const bool isStatic = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
         static const mozilla::jni::CallingThread callingThread =
                 mozilla::jni::CallingThread::GECKO;
         static const mozilla::jni::DispatchTarget dispatchTarget =
                 mozilla::jni::DispatchTarget::CURRENT;
     };
 
-    static auto Create(mozilla::jni::String::Param, mozilla::jni::Object::Param) -> GeckoHlsResourceWrapper::LocalRef;
+    static auto Create(mozilla::jni::String::Param, mozilla::jni::Object::Param) -> GeckoHLSResourceWrapper::LocalRef;
 
     struct Destroy_t {
-        typedef GeckoHlsResourceWrapper Owner;
+        typedef GeckoHLSResourceWrapper Owner;
         typedef void ReturnType;
         typedef void SetterType;
         typedef mozilla::jni::Args<> Args;
         static constexpr char name[] = "destroy";
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
@@ -5910,61 +5910,61 @@ public:
 
     auto Destroy() const -> void;
 
     static const mozilla::jni::CallingThread callingThread =
             mozilla::jni::CallingThread::ANY;
 
 };
 
-class GeckoHlsResourceWrapper::HlsResourceCallbacks : public mozilla::jni::ObjectBase<HlsResourceCallbacks>
+class GeckoHLSResourceWrapper::Callbacks : public mozilla::jni::ObjectBase<Callbacks>
 {
 public:
     static const char name[];
 
-    explicit HlsResourceCallbacks(const Context& ctx) : ObjectBase<HlsResourceCallbacks>(ctx) {}
+    explicit Callbacks(const Context& ctx) : ObjectBase<Callbacks>(ctx) {}
 
     struct New_t {
-        typedef HlsResourceCallbacks Owner;
-        typedef HlsResourceCallbacks::LocalRef ReturnType;
-        typedef HlsResourceCallbacks::Param SetterType;
+        typedef Callbacks Owner;
+        typedef Callbacks::LocalRef ReturnType;
+        typedef Callbacks::Param SetterType;
         typedef mozilla::jni::Args<> Args;
         static constexpr char name[] = "<init>";
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
         static const mozilla::jni::CallingThread callingThread =
                 mozilla::jni::CallingThread::GECKO;
         static const mozilla::jni::DispatchTarget dispatchTarget =
                 mozilla::jni::DispatchTarget::CURRENT;
     };
 
-    static auto New() -> HlsResourceCallbacks::LocalRef;
+    static auto New() -> Callbacks::LocalRef;
 
     struct OnDataArrived_t {
-        typedef HlsResourceCallbacks Owner;
+        typedef Callbacks Owner;
         typedef void ReturnType;
         typedef void SetterType;
         typedef mozilla::jni::Args<> Args;
         static constexpr char name[] = "onDataArrived";
         static constexpr char signature[] =
                 "()V";
         static const bool isStatic = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
         static const mozilla::jni::CallingThread callingThread =
                 mozilla::jni::CallingThread::ANY;
         static const mozilla::jni::DispatchTarget dispatchTarget =
                 mozilla::jni::DispatchTarget::GECKO;
     };
 
     struct OnError_t {
-        typedef HlsResourceCallbacks Owner;
+        typedef Callbacks Owner;
         typedef void ReturnType;
         typedef void SetterType;
         typedef mozilla::jni::Args<
                 int32_t> Args;
         static constexpr char name[] = "onError";
         static constexpr char signature[] =
                 "(I)V";
         static const bool isStatic = false;
@@ -5977,25 +5977,25 @@ public:
     };
 
     static const mozilla::jni::CallingThread callingThread =
             mozilla::jni::CallingThread::ANY;
 
     template<class Impl> class Natives;
 };
 
-class GeckoHlsSample : public mozilla::jni::ObjectBase<GeckoHlsSample>
+class GeckoHLSSample : public mozilla::jni::ObjectBase<GeckoHLSSample>
 {
 public:
     static const char name[];
 
-    explicit GeckoHlsSample(const Context& ctx) : ObjectBase<GeckoHlsSample>(ctx) {}
+    explicit GeckoHLSSample(const Context& ctx) : ObjectBase<GeckoHLSSample>(ctx) {}
 
     struct IsEOS_t {
-        typedef GeckoHlsSample Owner;
+        typedef GeckoHLSSample Owner;
         typedef bool ReturnType;
         typedef bool SetterType;
         typedef mozilla::jni::Args<> Args;
         static constexpr char name[] = "isEOS";
         static constexpr char signature[] =
                 "()Z";
         static const bool isStatic = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
@@ -6004,17 +6004,17 @@ public:
                 mozilla::jni::CallingThread::ANY;
         static const mozilla::jni::DispatchTarget dispatchTarget =
                 mozilla::jni::DispatchTarget::CURRENT;
     };
 
     auto IsEOS() const -> bool;
 
     struct IsKeyFrame_t {
-        typedef GeckoHlsSample Owner;
+        typedef GeckoHLSSample Owner;
         typedef bool ReturnType;
         typedef bool SetterType;
         typedef mozilla::jni::Args<> Args;
         static constexpr char name[] = "isKeyFrame";
         static constexpr char signature[] =
                 "()Z";
         static const bool isStatic = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
@@ -6023,17 +6023,17 @@ public:
                 mozilla::jni::CallingThread::ANY;
         static const mozilla::jni::DispatchTarget dispatchTarget =
                 mozilla::jni::DispatchTarget::CURRENT;
     };
 
     auto IsKeyFrame() const -> bool;
 
     struct WriteToByteBuffer_t {
-        typedef GeckoHlsSample Owner;
+        typedef GeckoHLSSample Owner;
         typedef void ReturnType;
         typedef void SetterType;
         typedef mozilla::jni::Args<
                 mozilla::jni::ByteBuffer::Param> Args;
         static constexpr char name[] = "writeToByteBuffer";
         static constexpr char signature[] =
                 "(Ljava/nio/ByteBuffer;)V";
         static const bool isStatic = false;
@@ -6043,17 +6043,17 @@ public:
                 mozilla::jni::CallingThread::ANY;
         static const mozilla::jni::DispatchTarget dispatchTarget =
                 mozilla::jni::DispatchTarget::CURRENT;
     };
 
     auto WriteToByteBuffer(mozilla::jni::ByteBuffer::Param) const -> void;
 
     struct CryptoInfo_t {
-        typedef GeckoHlsSample Owner;
+        typedef GeckoHLSSample Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
         typedef mozilla::jni::Object::Param SetterType;
         typedef mozilla::jni::Args<> Args;
         static constexpr char name[] = "cryptoInfo";
         static constexpr char signature[] =
                 "Landroid/media/MediaCodec$CryptoInfo;";
         static const bool isStatic = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
@@ -6062,17 +6062,17 @@ public:
                 mozilla::jni::CallingThread::ANY;
         static const mozilla::jni::DispatchTarget dispatchTarget =
                 mozilla::jni::DispatchTarget::CURRENT;
     };
 
     auto CryptoInfo() const -> mozilla::jni::Object::LocalRef;
 
     struct Duration_t {
-        typedef GeckoHlsSample Owner;
+        typedef GeckoHLSSample Owner;
         typedef int64_t ReturnType;
         typedef int64_t SetterType;
         typedef mozilla::jni::Args<> Args;
         static constexpr char name[] = "duration";
         static constexpr char signature[] =
                 "J";
         static const bool isStatic = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
@@ -6083,17 +6083,17 @@ public:
                 mozilla::jni::DispatchTarget::CURRENT;
     };
 
     auto Duration() const -> int64_t;
 
     auto Duration(int64_t) const -> void;
 
     struct FormatIndex_t {
-        typedef GeckoHlsSample Owner;
+        typedef GeckoHLSSample Owner;
         typedef int32_t ReturnType;
         typedef int32_t SetterType;
         typedef mozilla::jni::Args<> Args;
         static constexpr char name[] = "formatIndex";
         static constexpr char signature[] =
                 "I";
         static const bool isStatic = false;
         static const mozilla::jni::ExceptionMode exceptionMode =
@@ -6102,17 +6102,17 @@ public:
                 mozilla::jni::CallingThread::ANY;
         static const mozilla::jni::DispatchTarget dispatchTarget =
                 mozilla::jni::DispatchTarget::CURRENT;
     };
 
     auto FormatIndex() const -> int32_t;
 
     struct Info_t {
-        typedef GeckoHlsSample Owner;
+        typedef GeckoHLSSample Owner;
         typedef mozilla::jni::Object::LocalRef ReturnType;
         typedef mozilla::jni::Object::Param SetterType;
         typedef mozilla::jni::Args<> Args;
         static constexpr char name[] = "info";
         static constexpr char signature[] =
                 "Landroid/media/MediaCodec$BufferInfo;";
         static const bool isStatic = false;
         static const mozilla::jni::ExceptionMode exceptionMode =