Revert names

This reverts PR #123 which clearly broke instancing for some reason that I can't figure out just yet.