diff --git a/src/buffer_manager.cc b/src/buffer_manager.cc
index 4894dc65..88ed99a5 100644
--- a/src/buffer_manager.cc
+++ b/src/buffer_manager.cc
@@ -95,8 +95,8 @@ void BufferManager::set_last_used_buffer(Buffer& buffer)
     m_buffers.emplace(m_buffers.begin(), &buffer);
 }
 
-CandidateList BufferManager::complete_buffername(const String& prefix,
-                                                 ByteCount cursor_pos)
+CandidateList BufferManager::complete_buffer_name(const String& prefix,
+                                                  ByteCount cursor_pos)
 {
     String real_prefix = prefix.substr(0, cursor_pos);
     const bool include_dirs = contains(real_prefix, '/');
diff --git a/src/buffer_manager.hh b/src/buffer_manager.hh
index 01c30e81..97124a2c 100644
--- a/src/buffer_manager.hh
+++ b/src/buffer_manager.hh
@@ -33,8 +33,8 @@ public:
     Buffer& get_buffer(const String& name);
     void    set_last_used_buffer(Buffer& buffer);
 
-    CandidateList complete_buffername(const String& prefix,
-                                      ByteCount cursor_pos = -1);
+    CandidateList complete_buffer_name(const String& prefix,
+                                       ByteCount cursor_pos = -1);
 
 private:
     BufferList m_buffers;
diff --git a/src/commands.cc b/src/commands.cc
index cf0c1142..6160f811 100644
--- a/src/commands.cc
+++ b/src/commands.cc
@@ -96,7 +96,7 @@ const PerArgumentCommandCompleter filename_completer({
 const PerArgumentCommandCompleter buffer_completer({
     [](const Context& context, CompletionFlags flags, const String& prefix, ByteCount cursor_pos)
     { return Completions{ 0_byte, prefix.length(),
-                          BufferManager::instance().complete_buffername(prefix, cursor_pos) }; }
+                          BufferManager::instance().complete_buffer_name(prefix, cursor_pos) }; }
 });
 
 const ParameterDesc no_params{