Adjusted form names/ids/classes for consistency.