Tidy up k5-int.h variable name constants

Fix three mismatched constant names, and properly alphabetize and
columnize the lists of definitions.  No functional changes.