Trying to fix name problems on Windows