Renames some functions and makes the wrapper work for proposals and
datasets. This is discussed in #6