Modified form classes naming scheme.