Change to new naming convention.