variables naming update