diff --git a/libheif/bitstream.cc b/libheif/bitstream.cc
index 0c4e9e60f7..1cfe4abc31 100644
--- a/libheif/bitstream.cc
+++ b/libheif/bitstream.cc
@@ -758,7 +758,7 @@ void StreamWriter::write64(uint64_t v)
 }
 
 
-void StreamWriter::write64(int64_t v)
+void StreamWriter::write64s(int64_t v)
 {
   write64(reinterpret_cast<uint64_t&>(v));
 }
diff --git a/libheif/bitstream.h b/libheif/bitstream.h
index 0f8e5a9422..6d1c8ed13a 100644
--- a/libheif/bitstream.h
+++ b/libheif/bitstream.h
@@ -442,7 +442,7 @@ class StreamWriter
 
   void write_float32(float);
 
-  void write64(int64_t);
+  void write64s(int64_t);
 
   void write(int size, uint64_t value);
 
diff --git a/tests/bitstream_tests.cc b/tests/bitstream_tests.cc
index e30f15937e..01b68c3e5a 100644
--- a/tests/bitstream_tests.cc
+++ b/tests/bitstream_tests.cc
@@ -81,6 +81,6 @@ TEST_CASE("read float") {
   std::vector<uint8_t> byteArray{0x40, 0x00, 0x00, 0x00};
   std::shared_ptr<StreamReader_memory> stream = std::make_shared<StreamReader_memory>(byteArray.data(), (int)byteArray.size(), false);
   BitstreamRange uut(stream, byteArray.size(), nullptr);
-  float f = uut.readFloat32();
+  float f = uut.read_float32();
   REQUIRE(f == 2.0);
 }