Kernel Support Added, Changed Naming Convention