Partial 2.4.10 Resolve Pending Issues

Put in same initial form for name as had for id