Update doc, fix name convention