Renamed things related to the kernel.