Fix namespace mistakes.