Adding better name handling