Fix #980: Protect from exported method and property conflict
Merge pull request #982 from gzm0/fix-export-clash

Fix #980: Protect from exported method and property conflict