Rename for improved naming convention.