Attempting to make the various async names consistent