update doc and internal variables naming.