Clean up name->name conversion a little, *make sure it happens in all the
right places*!
2 files changed