Changed classes & naming.