Fixed namespace conflix issues.