Rename demo namespace everywhere