Fix capitalization

* Fix capitalization
* Fix <br /> tags
* Give grep a chance to find the usages

Change-Id: I9be306c43b3a778ea59786d22b091ad48d57168f