Fix up some various naming issues after inclusion of max_online_cpus code
derp

Change-Id: Ic08d1ee524415b7510e870a63a2ee9c4f4436325