More formatting.c variable renaming, for clarity
Revert f68dc5d86b9f287f80f4417f5a24d876eb13771d

Renaming will have to be more comprehensive, so I need approval.