Window task done and some names changed!