Switch to new save', which preserves extension and returns name