Merge pull request #4019 from cjshmyr/tilesetfix

Fixes #3865
Rename Capture related traits to ExternalCapture
Rename LegacyCapture related traits to Capture