fixing variables naming