modify name images, and factorized helpers