Fix bug with casing of classes
Fix bug with automatic labels