udpated variables naming