Adapted to new naming pattern