Fix CPU names as suggested by Francesco.