Improve kernel naming