Cleanup -m 115xx kernels to latest standard