match cider's renamed functions