Unified some terminology used