Merge "change kernel config naming convention"