Fixed window naming