Nicer names for restore
Fixed one off error in restore