Modified image name and some scripts