- Renamed variables in Backup and Restore to have better readability
- Moved CriteriaBuilder to RestoreFactory