Go with the new naming convention on Cider.