Unreviewed, fix the module name resolution in Windows