Refactor: New naming convention.