Rename to conform to better naming convention.