Rename info items and reformat a bit.