Update doc & naming