Cleanup window state names