Refactor to convention.