Capitalization matters
Merge branch 'hotfix/capitalization-fix' into develop