kick <-> kicking
punch <-> punching

Unless this has been settled in some other discussion(s).

Punch already seems to be aliased to punching. So I guess kick -> kicking. Done.