Hi there,
I would put it first just after the defines of LIBs, make sure the Lengths are correct for the Text used.
also You may need to Roll back to an Earlier BSP , as it may no longer be appropriate if it’s been depreciated by espressif’s latest “GIFT” to the industries code base compatibility. Version 3.x update.
Also the effects of the WIndows computers registered Device ID needs to be wiped for it to keep the new name is what I’m thinking too.
HTH
GL 
PJ
it probably works with the current BSP but the win10 box still needs experimentation. 