Merge pull request #1494 from TheBlueMatt/2022-05-mon-cleanups-renames