Rename namespaceAsPath
Merge pull request #3093 from derekwaynecarr/more_client_updates

Follow-up review comments from 3066