fixed naming issue for classes.