tested on wine and some more renaming