Changed classes and header names