Fixed namespace bugs.