Bulk rename.

Make names more consistant.

Change-Id: I3163de04a42f4c5e9b1cc8c409c8f1b9cd79d347
Improve verbose display.

Change-Id: I5cda3de1792dfb1cf0e01586bad209faeb0eb72f