Partial 2.4.10 Resolve Pending Issues

made change id and change name new edit way