Minor form type name changes.