Fixed namespace issues in demo client