name handling improvements