Fixed bad upload.

Renamed some forms.