Refactoring errors, names, kernel