add Form name parsing