diff --git a/Emacs.md b/Emacs.md
index d24e570..9e9f1b0 100644
--- a/Emacs.md
+++ b/Emacs.md
@@ -164,10 +164,10 @@ Recommended helpers:
   (lsp-ui-peek-find-custom 'caller "$ccls/call"))
 (defun ccls/vars (kind)
   (lsp-ui-peek-find-custom 'vars "$ccls/vars" `(:kind ,kind)))
-(defun ccls/base (level)
-  (lsp-ui-peek-find-custom 'base "$ccls/inheritance" `(:level ,level)))
-(defun ccls/derived (level)
-  (lsp-ui-peek-find-custom 'derived "$ccls/inheritance" `(:level ,level :derived t)))
+(defun ccls/base (levels)
+  (lsp-ui-peek-find-custom 'base "$ccls/inheritance" `(:levels ,levels)))
+(defun ccls/derived (levels)
+  (lsp-ui-peek-find-custom 'derived "$ccls/inheritance" `(:levels ,levels :derived t)))
 (defun ccls/member ()
   (interactive)
   (lsp-ui-peek-find-custom 'member "$ccls/member"))
diff --git a/FAQ.md b/FAQ.md
index a2f72f7..fc8138a 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -165,7 +165,7 @@ ccls will save a file in `cacheDirectory`:
 * <code>extern int <kbd>a</kbd>;</code> If `ReferenceContext.includeDeclaration` is true, the definition and declarations are also listed.
 * If no references is found but the point is on the first line, list `#include` lines referencing current file.
 
-### `$ccls/memberHierarchy flat:true derived:false`
+### `$ccls/member derived:false`
 
 * <code>struct <kbd>A</kbd>:B{void <kbd>f</kbd>()override;};</code> lists `B` or `B::f()`
 
@@ -178,20 +178,20 @@ ccls will save a file in `cacheDirectory`:
 * <code><kbd>A</kbd> <kbd>a</kbd>;</code> lists all instances of user-defined `A`.
 * <code>int <kbd>i</kbd>;</code> lists all instances of `int`.
 
-### [`$ccls/callHierarchy`](https://github.com/MaskRay/ccls/blob/master/src/messages/ccls_callHierarchy.cc)
+### [`$ccls/call`](https://github.com/MaskRay/ccls/blob/master/src/messages/ccls_call.cc)
 
 ```elisp
 (ccls-call-hierarchy nil) ; caller hierarchy
 (ccls-call-hierarchy t)   ; callee hierarchy
 ```
 
-### [`$ccls/inheritanceHierarchy`](https://github.com/MaskRay/ccls/blob/master/src/messages/ccls_inheritanceHierarchy.cc)
+### [`$ccls/inheritance`](https://github.com/MaskRay/ccls/blob/master/src/messages/ccls_inheritance.cc)
 
 ```elisp
 (ccls-inheritance-hierarchy nil) ; base hierarchy
 (ccls-inheritance-hierarchy t)   ; derived hierarchy
 ```
 
-### [`$ccls/memberHierarchy`](https://github.com/MaskRay/ccls/blob/master/src/messages/ccls_memberHierarchy.cc)
+### [`$ccls/member`](https://github.com/MaskRay/ccls/blob/master/src/messages/ccls_member.cc)
 
 Recursively list members of a record type. 😂 nobody has implemented vscode-ccls UI for the feature. Help wanted!
diff --git a/LanguageClient-neovim.md b/LanguageClient-neovim.md
index d0fc229..d745b2d 100644
--- a/LanguageClient-neovim.md
+++ b/LanguageClient-neovim.md
@@ -77,7 +77,7 @@ nn <silent> xl :call LanguageClient#findLocations({'method':'$ccls/navigate','di
 nn <silent> xb :call LanguageClient#findLocations({'method':'$ccls/inheritance'})<cr>
 " bases of up to 3 levels
 nn <silent> xB :call LanguageClient#findLocations({'method':'$ccls/inheritance','levels':3})<cr>
-" derived of up to 3 levels
+" derived
 nn <silent> xd :call LanguageClient#findLocations({'method':'$ccls/inheritance','derived':v:true})<cr>
 " derived of up to 3 levels
 nn <silent> xD :call LanguageClient#findLocations({'method':'$ccls/inheritance','derived':v:true,'levels':3})<cr>