Fix conflicting import names