[IMP] improve image's name management;