rename form-related classes; simplify span property construction

Merge request reports

Loading