Fixed bad namespace issues.