fixed Double digit name replacement