Fix up some various naming issues after inclusion of max_online_cpus code