Kernel name cleanup