Got a name collision here, so I renamed these in the YAML

This seemed the shortest path to happiness for now
Refactor the hell out of these
FOrmatting
To accomodate YAML refactoring
Cassettes