Get some better reporting, albeit klugey.
Name changes