Fix for invalid class names usage
Merge pull request #1409 from stloyd/bugfix/invalid_class_names

Fix for invalid class names usage