More removal of hyphens in behat.yml files