Added variable names for window items.

Has not been tested will require modificaiton of any references to these items.