fix some confusing terminology