Fix empty names