Updated examples to work in correct namespaces etc