More cider naming changes.