image name changes and CW-GRP- Finished