fix name handling