Fixed namespace and API issues.