(fix) #5 Normalize name in delete zone, before deleting
(chore) #5 More matching to save time from assigning a variable