Change naming of DFS Status and Terminator