There are a couple of things about this interface that need renaming. @dbu should I open a pr for the renaming?