Updated usage examples for new namespacing