Replaced few hardcode YAML names