Updated with new naming convention
Merge branch 'refs/heads/develop' into features/415/sample-ios-app