Fix for invalid class names usage