refactor to use proper naming