Fixed namespace naming