Fixed file naming issues for Windows