Remove hardcoded namespace