Refactor naming, scope.