Simplify terminology