Use name instead of __id__ for image names