X fixed names in window functions