Renamed namespace, fixed SAContext memory leak