fixed some inconsistent class names