Incomplete merge, apologies
scenarios -> scenarios-yml
Add name lookup hash in order to support multiple scenarios of same name