[ASFXNB238] Tweak some namespaces
Merge remote-tracking branch 'origin/ASFXNB238'