Tighten up terminology