Updated YML keys to align with json structure

cc @seancaffery