storage: use race-free AddNames
instead of SetNames
#1480
Merged
AddNames
instead of SetNames
#1480