More fixes from review.

* Fix regex for end of line.
* Rename NewJavaTool and friends to remove the New.