Do not double escape names. Fixes #36