QS: Capitalize more consistently

Change-Id: Idfe152a97e639c97ac68f98d516f7646f458c31e
Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>
Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1