lambda & kernel now follow naming convention