Refactors; use more consistent language (symbol)