Cleanup #1

Renamed some forms