Fix namespace collission