Some \SMW\ namespace clean-up

Change-Id: I298f6b097769d62d34ac0633b6e04c3ed3c2d1d6