Added fix for class names that may have symbols or numeric values