General refactor. Make terms more clear.