Merge pull request #406 from iamqizhao/master

rename some interop client flags