documentation and naming update