EG/HM: Renames to KeyCollector