Updated code to use namespaces instead of _ separated class names