Yeah. Although the benefit of setting it some years in the future is that she's gone through at least a couple of more major apocolypses since season 7, and her character could easily have changed in both minor or major ways. It doesn't have to be spot on, just recognizably as having come from who she once was.