more namespace corrections