Rename close to destroy

Rebased version of #1080