Fixes for wrong case in include file name

Change-Id: I23740eea54093433b1b4bf67ce9d2f38dd6e9164
Merge topic 'case_fixes' into master

2e1c54f6 Fixes for wrong case in include file name