Fix namespace
Fix conflicts