Fix stuff with names