Revert "Trickery with names...."

This reverts commit e257652eb40802b65a30f5a6a9a4b130cea1b3f2.