repair name handling