Fixed stupid namespace name conflict