fixing name generator(s)