naming conflict on windows should be resolved now, no other changes made