better name handling