Fix import conflict

Fixes import naming conflict between PR 64 and 69