Adjust name of YML keys and files