Removed the need for classes to suplly kernel name.