Sort abit: rename kernels/macros more in accordance to functionality