Small change to the name conversion logic