Trebuchet: Fix capitalization of some strings

* Don't Use Camel Case

Change-Id: I68abd367281a13dc472e5bc4d413a25e63f0e49a
Merge branch 'cm-11.0' into kk_mkt