refactor of names to make sense