Changed namespaces for demo app