Minor usages of KEYS
Rename MAKE-ID to UNIQUE
Rename STR to S
Minor rename