Made of copy of the kernel to clean it up a bit, also some namefixes.