Fix namespace conflict