Better encapsulate the new image name format