Deal with name generation better.