Adapted to new naming convention