Partial 2.4.10 Resolve Pending Issues

Developed name to be up with id and put all in sync with code