Merge "fix: rename Matterhorn, Matterhorn ELP, and Klein CPUs" into integration