small rename and refactor