Revert "[Convert] Workaround for broken names with spaces"

This reverts commit 1e78e62b906fd5fa9f10501ffd0543d4f3e3dc8d.
The relevant issue has been fixed upstream by Khronos.