Bug #2602: Fix DS name space on ESX