_ vs - in yaml and keywords

Just putting this here from memory...

There is a weird mix of _ vs - in the code, and - in the yamls. It makes it really hard to copy/paste keywords. I would prefer to keep just _ if possible (I vaguely remember there being an issue with that in yamls for some reason).

Will update as I remember and/or have time to run again, this is a placeholder for now.