Adjusts name mapping in formatter to handle multi-character line
separators