fix naming confusion in auto-generated helper functions with cookie/cooky
merge
show comments in design