Improve naming
Refactor restore validation