change class names

change the "cider" making class names to more appropriate ones