Consistency tweaks: Remove Title Case

Change-Id: Ia42a3075560cd0670ceab02a8333908325975e1e