Attributes in D&D have always been rather messy if you look too closely at them IMO. Sometimes willpower is Wisdom, sometimes it's Charisma. Intelligence is a measure of memory, quickness of mind. Except when the latter is tied to Wisdom or Charisma. Etc. Could stand for a reorganization I think, but are too iconic to be touched at this point probably.
