avoid long names to break forms sizes
Merge remote-tracking branch 'timo/master'