Some reformatting and renaming


No functional change.