Adjust SMW\Api NS usage

Change-Id: Iaa1ec25a578e733593efe111fac8e7acb24df0ca
Merge "Adjust SMW\Api NS usage"