Tiny modification on terminology
Modify yaml output