update demo / fix name space