SI-3353 WIP -- needs fix in namesdefaults
SI-3353 WIP -- needs fix in namesdefaults