fixed the type naming conflict