Fix import conflict
Merge pull request #76 from aagbsn/fix_import_rename

Fix import conflict