Name fixes

Renamed forms and report.