Adapt to new naming convention.