Changed class names back to capitalized