Fix null names