Fixed name not changing on the next one, added window option