Form class names shortened in line with the rest of the Spark v2.0 class changes.