Removed -Normal- in the class names