Reduce diff before functional changes:

• Use ic_name instead of if_xname.
• Formatting cleanup.