Merge pull request #674 from TheBlueMatt/2020-08-keyif-rand-names