Rework rom name handling