Update with new naming convention.