First atempt to fix broken win-names