Consistent variable names.
Added kernel k2. Test battery in progress.