Fixed namespace path issues