Export/import related changes
Fix typo and proper name