Changed names of net40 assemblies to fix build conflict