refactored names of kernel mapper