Changed classes’s names