Fix more namespace references