Made CSS class names more consistent