Use new naming internally.