Refactor | Beverly | rename point to position