Fixes #823: consistent interface naming