Fixed naming for classes.