Move key back to task and fix backup file name