refactor, change names