more consistent variables naming