One more fix to the CSS class name errors