save remote files using their names, update #2646