Fix #6065: remove underscores when using MAG_NAMESPACE & MAG_TALKSPACE