Maintains naming convention from Go for QML project
Merge branch 'go'