Fixed window naming a little