Switched to ''-notation for class names