Yaml doc; functions renamed