Class names redone