Use new naming scheme