Rename definitions
Merge branch 'master' of github.com:aam229/aws-flow-client