improve terminology a bit