Sandy/Ivy Bridge and Cougar/Panther Point: Fix names