There were several duplicated entries. Where they appeared
actually-different, I changed the name. Where they appeared identical, I
deleted the duplicate.
These will be linted in the future once we switch to pre-commit.
Change-Id: I880dc6b6de593c12e5ac026edfbe95258e87bcde