Fix namespace collision