Renamed Forms to conform to standards