more name fiddling