Update to new naming convention