improving name handling