samples updated with namespaces