Variables names updated