adapt to new naming strategy