refactor some names