diff --git a/quiche/common/quiche_weak_ptr.h b/quiche/common/quiche_weak_ptr.h
index 29dc6d6..c742f65 100644
--- a/quiche/common/quiche_weak_ptr.h
+++ b/quiche/common/quiche_weak_ptr.h
@@ -53,7 +53,7 @@
 
   // Returns the pointer to the underlying object if it is alive, or nullptr
   // otherwise.
-  absl::Nullable<T*> GetIfAvaliable() const {
+  absl::Nullable<T*> GetIfAvailable() const {
     return control_block_ != nullptr ? control_block_->Get() : nullptr;
   }
 
diff --git a/quiche/common/quiche_weak_ptr_test.cc b/quiche/common/quiche_weak_ptr_test.cc
index f07d707..7b86d89 100644
--- a/quiche/common/quiche_weak_ptr_test.cc
+++ b/quiche/common/quiche_weak_ptr_test.cc
@@ -22,14 +22,14 @@
 TEST(QuicheWeakPtrTest, Empty) {
   QuicheWeakPtr<TestClass> ptr;
   EXPECT_FALSE(ptr.IsValid());
-  EXPECT_EQ(ptr.GetIfAvaliable(), nullptr);
+  EXPECT_EQ(ptr.GetIfAvailable(), nullptr);
 }
 
 TEST(QuicheWeakPtrTest, Valid) {
   TestClass object;
   QuicheWeakPtr<TestClass> ptr = object.CreateWeakPtr();
   EXPECT_TRUE(ptr.IsValid());
-  EXPECT_EQ(ptr.GetIfAvaliable(), &object);
+  EXPECT_EQ(ptr.GetIfAvailable(), &object);
 }
 
 TEST(QuicheWeakPtrTest, ValidCopy) {
@@ -38,8 +38,8 @@
   QuicheWeakPtr<TestClass> ptr_copy = ptr;
   EXPECT_TRUE(ptr.IsValid());
   EXPECT_TRUE(ptr_copy.IsValid());
-  EXPECT_EQ(ptr.GetIfAvaliable(), &object);
-  EXPECT_EQ(ptr_copy.GetIfAvaliable(), &object);
+  EXPECT_EQ(ptr.GetIfAvailable(), &object);
+  EXPECT_EQ(ptr_copy.GetIfAvailable(), &object);
 }
 
 TEST(QuicheWeakPtrTest, EmptyAfterMove) {
@@ -48,8 +48,8 @@
   QuicheWeakPtr<TestClass> ptr_moved = std::move(ptr);
   EXPECT_FALSE(ptr.IsValid());  // NOLINT(bugprone-use-after-move)
   EXPECT_TRUE(ptr_moved.IsValid());
-  EXPECT_EQ(ptr.GetIfAvaliable(), nullptr);  // NOLINT(bugprone-use-after-move)
-  EXPECT_EQ(ptr_moved.GetIfAvaliable(), &object);
+  EXPECT_EQ(ptr.GetIfAvailable(), nullptr);  // NOLINT(bugprone-use-after-move)
+  EXPECT_EQ(ptr_moved.GetIfAvailable(), &object);
 }
 
 TEST(QuicheWeakPtrTest, Expired) {
diff --git a/quiche/quic/moqt/moqt_session.cc b/quiche/quic/moqt/moqt_session.cc
index 10b5939..5fda82e 100644
--- a/quiche/quic/moqt/moqt_session.cc
+++ b/quiche/quic/moqt/moqt_session.cc
@@ -1108,7 +1108,7 @@
                 !parser_.stream_type().has_value())
       << "Object delivered without a stream type";
   // Get a pointer to the upstream state.
-  RemoteTrack* track = track_.GetIfAvaliable();
+  RemoteTrack* track = track_.GetIfAvailable();
   if (track == nullptr) {
     track = (*parser_.stream_type() == MoqtDataStreamType::kStreamHeaderFetch)
                 // message.track_alias is actually a fetch ID for fetches.
